From 7a83a44077f58708f00e950513db350f2192b794 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 17 Dec 2022 11:31:51 +0100
Subject: [PATCH] Fix threaded message rendering rich reply when they shouldn't

Change-Id: I5a1c1d177d896d203f2420bdd1536dfcbbd460d6
---
 .../home/room/detail/timeline/reply/ReplyPreviewRetriever.kt   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reply/ReplyPreviewRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reply/ReplyPreviewRetriever.kt
index 19013a6ac6..342370e17a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reply/ReplyPreviewRetriever.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/reply/ReplyPreviewRetriever.kt
@@ -124,7 +124,8 @@ class ReplyPreviewRetriever(
         synchronized(data) {
             val current = data[eventId]
 
-            val repliedToEventId = event.root.getRelationContent()?.inReplyTo?.eventId
+            val relationContent = event.root.getRelationContent()
+            val repliedToEventId = relationContent?.inReplyTo?.eventId?.takeIf { relationContent.isFallingBack != true }
             if (current == null || repliedToEventId != current.latestRepliedToEventId) {
                 // We have not rendered this yet, or the replied-to event has updated
                 if (repliedToEventId?.isNotEmpty().orFalse()) {