diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 2f3de3a86..8d4734083 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -88,38 +88,34 @@
             class="thread-ancestor"
             :class="{'thread-ancestor-has-other-replies': getReplies(status.id).length > 1, '-faded': shouldFadeAncestors}"
           >
-            <status
+            <Status
               ref="statusComponent"
-              :inline-expanded="collapsable && isExpanded"
-              :statusoid="status"
-              :expandable="!isExpanded"
-              :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
-              :focused="isFocused(status.id)"
-              :in-conversation="isExpanded"
-              :highlight="getHighlight()"
-              :replies="getReplies(status.id)"
-              :in-profile="inProfile"
-              :profile-user-id="profileUserId"
               class="conversation-status status-fadein panel-body"
 
+              :statusoid="status"
+              :replies="getReplies(status.id)"
+
+              :expandable="!isExpanded"
+              :focused="isFocused(status.id)"
+              :highlight="getHighlight()"
+              :inline-expanded="collapsable && isExpanded"
+              :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
+              :in-profile="inProfile"
+              :in-conversation="isExpanded"
+              :profile-user-id="profileUserId"
               :simple-tree="treeViewIsSimple"
-              :toggle-thread-display="toggleThreadDisplay"
-              :thread-display-status="threadDisplayStatus"
-              :show-thread-recursively="showThreadRecursively"
-              :total-reply-count="totalReplyCount"
-              :total-reply-depth="totalReplyDepth"
               :show-other-replies-as-button="showOtherRepliesButtonInsideStatus"
               :dive="() => diveIntoStatus(status.id)"
 
               :controlled-showing-tall="statusContentProperties[status.id].showingTall"
-              :controlled-expanding-subject="statusContentProperties[status.id].expandingSubject"
-              :controlled-showing-long-subject="statusContentProperties[status.id].showingLongSubject"
-              :controlled-replying="statusContentProperties[status.id].replying"
-              :controlled-media-playing="statusContentProperties[status.id].mediaPlaying"
               :controlled-toggle-showing-tall="() => toggleStatusContentProperty(status.id, 'showingTall')"
+              :controlled-expanding-subject="statusContentProperties[status.id].expandingSubject"
               :controlled-toggle-expanding-subject="() => toggleStatusContentProperty(status.id, 'expandingSubject')"
+              :controlled-showing-long-subject="statusContentProperties[status.id].showingLongSubject"
               :controlled-toggle-showing-long-subject="() => toggleStatusContentProperty(status.id, 'showingLongSubject')"
+              :controlled-replying="statusContentProperties[status.id].replying"
               :controlled-toggle-replying="() => toggleStatusContentProperty(status.id, 'replying')"
+              :controlled-media-playing="statusContentProperties[status.id].mediaPlaying"
               :controlled-set-media-playing="(newVal) => toggleStatusContentProperty(status.id, 'mediaPlaying', newVal)"
 
               @goto="setHighlight"
@@ -195,26 +191,18 @@
             v-for="status in conversation"
             :key="status.id"
             ref="statusComponent"
-            :inline-expanded="collapsable && isExpanded"
-            :statusoid="status"
-            :expandable="!isExpanded"
-            :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
-            :focused="isFocused(status.id)"
-            :in-conversation="isExpanded"
-            :highlight="getHighlight()"
-            :replies="getReplies(status.id)"
-            :in-profile="inProfile"
-            :profile-user-id="profileUserId"
             class="conversation-status status-fadein panel-body"
+            :statusoid="status"
+            :replies="getReplies(status.id)"
 
-            :toggle-thread-display="toggleThreadDisplay"
-            :thread-display-status="threadDisplayStatus"
-            :show-thread-recursively="showThreadRecursively"
-            :total-reply-count="totalReplyCount"
-            :total-reply-depth="totalReplyDepth"
-            :status-content-properties="statusContentProperties"
-            :set-status-content-property="setStatusContentProperty"
-            :toggle-status-content-property="toggleStatusContentProperty"
+            :expandable="!isExpanded"
+            :focused="isFocused(status.id)"
+            :highlight="getHighlight()"
+            :inline-expanded="collapsable && isExpanded"
+            :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
+            :in-profile="inProfile"
+            :in-conversation="isExpanded"
+            :profile-user-id="profileUserId"
 
             @goto="setHighlight"
             @toggle-expanded="toggleExpanded"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index a43154ce2..634e74f5e 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -131,25 +131,26 @@ const Status = {
   },
   props: [
     'statusoid',
+    'replies',
+
     'expandable',
-    'inConversation',
     'focused',
     'highlight',
     'compact',
-    'replies',
     'isPreview',
     'noHeading',
     'inlineExpanded',
     'showPinned',
     'inProfile',
-    'profileUserId',
+    'inConversation',
     'inQuote',
-
+    'profileUserId',
     'simpleTree',
+    'showOtherRepliesAsButton',
+    'dive',
+
     'controlledThreadDisplayStatus',
     'controlledToggleThreadDisplay',
-    'showOtherRepliesAsButton',
-
     'controlledShowingTall',
     'controlledToggleShowingTall',
     'controlledExpandingSubject',
@@ -160,9 +161,8 @@ const Status = {
     'controlledToggleReplying',
     'controlledMediaPlaying',
     'controlledSetMediaPlaying',
-    'dive',
   ],
-  emits: ['interacted'],
+  emits: ['interacted', 'goto', 'toggleExpanded'],
   data() {
     return {
       uncontrolledReplying: false,