diff --git a/native/chat/text-message-tooltip-modal.react.js b/native/chat/text-message-tooltip-modal.react.js
--- a/native/chat/text-message-tooltip-modal.react.js
+++ b/native/chat/text-message-tooltip-modal.react.js
@@ -54,12 +54,7 @@
       onPress: onPressReport,
     },
     {
-      id: 'create_sidebar',
-      text: 'Thread',
-      onPress: navigateToSidebar,
-    },
-    {
-      id: 'open_sidebar',
+      id: 'sidebar',
       text: 'Thread',
       onPress: navigateToSidebar,
     },
diff --git a/native/chat/text-message.react.js b/native/chat/text-message.react.js
--- a/native/chat/text-message.react.js
+++ b/native/chat/text-message.react.js
@@ -119,10 +119,8 @@
       result.push('reply');
     }
 
-    if (this.props.item.threadCreatedFromMessage) {
-      result.push('open_sidebar');
-    } else if (this.props.canCreateSidebarFromMessage) {
-      result.push('create_sidebar');
+    if (this.props.canCreateSidebarFromMessage) {
+      result.push('sidebar');
     }
 
     if (!this.props.item.messageInfo.creator.isViewer) {
diff --git a/native/navigation/tooltip.react.js b/native/navigation/tooltip.react.js
--- a/native/navigation/tooltip.react.js
+++ b/native/navigation/tooltip.react.js
@@ -130,7 +130,8 @@
         );
       } else if (
         this.props.spec.id === 'create_sidebar' ||
-        this.props.spec.id === 'open_sidebar'
+        this.props.spec.id === 'open_sidebar' ||
+        this.props.spec.id === 'sidebar'
       ) {
         icon = (
           <SWMansionIcon