From 8a226781c4bcc6594fb81e0405a37fe5de78a036 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 7 Oct 2020 11:08:43 +0100
Subject: [PATCH] Fix edited replies being wrongly treated as big emoji

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/TextualBody.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index e83262ce69..9764b08e5b 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -401,7 +401,8 @@ export default class TextualBody extends React.Component {
         const mxEvent = this.props.mxEvent;
         const content = mxEvent.getContent();
 
-        const stripReply = ReplyThread.getParentEventId(mxEvent);
+        // only strip reply if this is the original replying event, edits thereafter do not have the fallback
+        const stripReply = !mxEvent.replacingEvent() && ReplyThread.getParentEventId(mxEvent);
         let body = HtmlUtils.bodyToHtml(content, this.props.highlights, {
             disableBigEmoji: content.msgtype === "m.emote" || !SettingsStore.getValue('TextualBody.enableBigEmoji'),
             // Part of Replies fallback support