From 7e7f20cddfbf7deab2c3d73740bf2560335fc0c4 Mon Sep 17 00:00:00 2001
From: klopez4212 <klopez4212@gmail.com>
Date: Sat, 27 Jun 2026 11:42:30 +0100
Subject: [PATCH] Route threaded tasks from loaded message metadata

---
 desktop/src/features/channels/ui/ChannelPane.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index 9faaa43e6..7423ac2e6 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -615,7 +615,13 @@ export const ChannelPane = React.memo(function ChannelPane({
       threadMessage: TimelineMessage,
     ) => {
       onSurfaceTabChange?.("messages");
-      if (marker.parentMessageId) {
+      const isThreadedTask =
+        Boolean(marker.parentMessageId) ||
+        Boolean(message.parentId) ||
+        Boolean(message.rootId && message.rootId !== message.id) ||
+        threadMessage.id !== message.id;
+
+      if (isThreadedTask) {
         onOpenThread(threadMessage);
         onSelectThreadReplyTarget(message);
         onThreadScrollTargetChange(message.id);