From 595deb3a3de26f5018353a50b88d477914c8135e Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 21 Dec 2021 13:46:21 +0530
Subject: [PATCH] Also copy over contextEntry from otherEntry

---
 src/matrix/room/timeline/entries/EventEntry.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/matrix/room/timeline/entries/EventEntry.js b/src/matrix/room/timeline/entries/EventEntry.js
index 93700842..4d19cf56 100644
--- a/src/matrix/room/timeline/entries/EventEntry.js
+++ b/src/matrix/room/timeline/entries/EventEntry.js
@@ -42,7 +42,8 @@ export class EventEntry extends BaseEventEntry {
         if (other._decryptionError && !this._decryptionError) {
             this._decryptionError = other._decryptionError;
         }
-        this._contextForEntries = other._contextForEntries;
+        this._contextForEntries = other.contextForEntries;
+        this._contextEntry = other.contextEntry;
     }
 
     setContextEntry(entry) {