From df6012c58daac0d41bbe4f6ca870965936739916 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 14 May 2019 15:25:07 +0100
Subject: [PATCH] completely avoid local echo for edits for now

---
 src/models/room.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/models/room.js b/src/models/room.js
index d72f801a8..91868af6b 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -1099,6 +1099,10 @@ Room.prototype._addLiveEvent = function(event, duplicateStrategy) {
  * unique transaction id.
  */
 Room.prototype.addPendingEvent = function(event, txnId) {
+    if (event.isReplacement()) {
+        return;
+    }
+
     if (event.status !== EventStatus.SENDING) {
         throw new Error("addPendingEvent called on an event with status " +
                         event.status);