diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index c3deac0a5..62818d23e 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -108,6 +108,7 @@
                 fixed-pinned
                 use-default-buttons
                 hide-labels
+                in-chat-view
                 @toggle-replying="$emit('replyRequested', message)"
               />
               <div
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 842944965..edc969b5b 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -18,6 +18,7 @@ import {
   faChevronDown,
   faChevronRight,
   faComments,
+  faList,
   faExternalLinkAlt,
   faEye,
   faEyeSlash,
@@ -58,6 +59,7 @@ library.add(
   faPencil,
   faShareAlt,
   faComments,
+  faList,
   faExternalLinkAlt,
   faHistory,
 )
diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index 8dde74364..b3762b8ec 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -222,13 +222,30 @@ export const BUTTONS = [
     // =========
     // OPEN IN CHAT VIEW
     // =========
-    name: 'edit',
+    name: 'chat_view',
     icon: 'comments',
     label: 'status.open_in_chat_view',
+    if({ chatView }) {
+      return !chatView
+    },
     action({ router, status }) {
       router.push({ name: 'conversation2', params: { statusId: status.id } })
     },
   },
+  {
+    // =========
+    // OPEN IN THREAD VIEW
+    // =========
+    name: 'thread_view',
+    icon: 'list',
+    label: 'status.open_in_thread_view',
+    if({ chatView }) {
+      return chatView
+    },
+    action({ router, status }) {
+      router.push({ name: 'conversation', params: { id: status.id } })
+    },
+  },
   {
     // =========
     // DELETE
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index d9c7943b7..73ac6ff7e 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -39,6 +39,10 @@ const StatusActionButtons = {
       type: Boolean,
       default: false,
     },
+    inChatView: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['toggleReplying', 'onSuccess', 'onError'],
   data() {
@@ -98,6 +102,7 @@ const StatusActionButtons = {
         router: this.$router,
         currentUser: this.currentUser,
         loggedIn: !!this.currentUser,
+        chatView: !!this.inChatView,
       }
     },
     triggerAttrs() {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 120054ddf..0da52d5c3 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1648,6 +1648,7 @@
     "edit": "Edit status",
     "edited_at": "(last edited {time})",
     "open_in_chat_view": "Open in chat view",
+    "open_in_thread_view": "Open in thread view",
     "pin": "Pin on profile",
     "unpin": "Unpin from profile",
     "pinned": "Pinned",