From 3f2bac71c6c657c161c853fe370d9efc948aafcb Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 15 May 2019 15:52:37 +0100
Subject: [PATCH] filter out replacements for senders that are not the original
 sender

---
 src/models/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/models/room.js b/src/models/room.js
index 471967549..480717be4 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -1037,7 +1037,7 @@ Room.prototype._addLiveEvent = function(event, duplicateStrategy) {
         const relatesTo = event.getContent()["m.relates_to"];
         const replacedId = relatesTo && relatesTo.event_id;
         const replacedEvent = this.getUnfilteredTimelineSet().findEventById(replacedId);
-        if (replacedEvent) {
+        if (replacedEvent && event.getSender() === replacedEvent.getSender()) {
             const doAndEmitReplacement = () => {
                 replacedEvent.makeReplaced(event);
                 this.emit("Room.replaceEvent", replacedEvent, this);