From e0880cce43b4bb486624d0d4fa020a273efddec0 Mon Sep 17 00:00:00 2001
From: Airyzz <36567925+Airyzz@users.noreply.github.com>
Date: Thu, 12 Mar 2026 23:34:35 +1030
Subject: [PATCH 1/2] Update matrix_timeline_event_mixin_related.dart

---
 .../matrix_timeline_event_mixin_related.dart  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart b/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart
index 00872b914..b3648cece 100644
--- a/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart
+++ b/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart
@@ -8,14 +8,19 @@ mixin MatrixTimelineEventRelated on MatrixTimelineEvent
   String? get relatedEventId => _getRelatedEventId();
 
   @override
-  EventRelationshipType? get relationshipType =>
-      switch (event.relationshipType) {
-        "m.in_reply_to" => EventRelationshipType.reply,
-        "m.thread" => _getThreadRichResponseId() != null
-            ? EventRelationshipType.reply
-            : null,
-        _ => null,
-      };
+  EventRelationshipType? get relationshipType {
+    var result = switch (event.relationshipType) {
+      "m.in_reply_to" => EventRelationshipType.reply,
+      "m.thread" =>
+        _getThreadRichResponseId() != null ? EventRelationshipType.reply : null,
+      _ => null,
+    };
+
+    if (result != null) return result;
+
+    var reply = event.inReplyToEventId();
+    if (reply != null) return EventRelationshipType.reply;
+  }
 
   String? _getThreadRichResponseId() {
     var rel = event.content["m.relates_to"] as Map<String, dynamic>?;
@@ -41,6 +46,9 @@ mixin MatrixTimelineEventRelated on MatrixTimelineEvent
       return _getThreadRichResponseId();
     }
 
+    var reply = event.inReplyToEventId();
+    if (reply != null) return reply;
+
     return event.relationshipEventId;
   }
 }

From bdf9f3fb6a0a056d3cf98bb39d1a6df8f1ea59a0 Mon Sep 17 00:00:00 2001
From: Airyzz <36567925+Airyzz@users.noreply.github.com>
Date: Thu, 12 Mar 2026 23:34:57 +1030
Subject: [PATCH 2/2] Update matrix_timeline_event_mixin_related.dart

---
 .../timeline_events/matrix_timeline_event_mixin_related.dart    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart b/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart
index b3648cece..a00104b18 100644
--- a/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart
+++ b/commet/lib/client/matrix/timeline_events/matrix_timeline_event_mixin_related.dart
@@ -20,6 +20,8 @@ mixin MatrixTimelineEventRelated on MatrixTimelineEvent
 
     var reply = event.inReplyToEventId();
     if (reply != null) return EventRelationshipType.reply;
+
+    return null;
   }
 
   String? _getThreadRichResponseId() {