From ec6bb880682286216458d73560aa91746d4f099b Mon Sep 17 00:00:00 2001
From: Germain <germains@element.io>
Date: Wed, 19 Jan 2022 13:37:19 +0000
Subject: [PATCH] Fix reply chain fallback for first event in a thread (#7580)

---
 src/components/structures/ThreadView.tsx     | 2 +-
 src/components/views/elements/ReplyChain.tsx | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/structures/ThreadView.tsx b/src/components/structures/ThreadView.tsx
index 12ed56f84b..97b255d4e8 100644
--- a/src/components/structures/ThreadView.tsx
+++ b/src/components/structures/ThreadView.tsx
@@ -212,7 +212,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
             "rel_type": RelationType.Thread,
             "event_id": this.state.thread?.id,
             "m.in_reply_to": {
-                "event_id": this.state.lastThreadReply?.getId(),
+                "event_id": this.state.lastThreadReply?.getId() ?? this.state.thread?.id,
             },
         };
 
diff --git a/src/components/views/elements/ReplyChain.tsx b/src/components/views/elements/ReplyChain.tsx
index 680407dc0e..21918d8969 100644
--- a/src/components/views/elements/ReplyChain.tsx
+++ b/src/components/views/elements/ReplyChain.tsx
@@ -101,8 +101,6 @@ export default class ReplyChain extends React.Component<IProps, IState> {
         if (!ev || ev.isRedacted()) return;
         if (ev.replyEventId) {
             return ev.replyEventId;
-        } else if (!SettingsStore.getValue("feature_thread") && ev.isThreadRelation) {
-            return ev.threadRootId;
         }
     }