diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 3e8932d94..152289098 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,6 +1,6 @@
-import { get, reduce } from 'lodash-es'
+import { get } from 'lodash-es'
 import { storeToRefs } from 'pinia'
-import { computed, nextTick, ref, watch, toRefs } from 'vue'
+import { computed, nextTick, provide, ref, toRefs, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import ChatMessageList from 'src/components/chat_message_list/chat_message_list.vue'
@@ -16,7 +16,10 @@ import { useOAuthStore } from 'src/stores/oauth.js'
 import { useStatusesStore } from 'src/stores/statuses.js'
 import { useStreamingStore } from 'src/stores/streaming.js'
 
-import { fetchConversation as apiFetchConversation, fetchStatus } from 'src/api/public.js'
+import {
+  fetchConversation as apiFetchConversation,
+  fetchStatus,
+} from 'src/api/public.js'
 import { WSConnectionStatus } from 'src/api/websocket.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -36,24 +39,6 @@ library.add(
   faTimes,
 )
 
-const sortById = (a, b) => {
-  const idA = a.type === 'retweet' ? a.retweeted_status.id : a.id
-  const idB = b.type === 'retweet' ? b.retweeted_status.id : b.id
-  const seqA = Number(idA)
-  const seqB = Number(idB)
-  const isSeqA = !Number.isNaN(seqA)
-  const isSeqB = !Number.isNaN(seqB)
-  if (isSeqA && isSeqB) {
-    return seqA < seqB ? -1 : 1
-  } else if (isSeqA && !isSeqB) {
-    return -1
-  } else if (!isSeqA && isSeqB) {
-    return 1
-  } else {
-    return idA < idB ? -1 : 1
-  }
-}
-
 export default {
   props: {
     statusId: {
@@ -61,34 +46,12 @@ export default {
       type: String,
       required: true,
     },
-    collapsable: {
-      // Whether conversation can be collapsed
-      // i.e. when it's not a page
-      type: Boolean,
-      default: false,
-    },
     isPage: {
       // Whether conversation is rendered as a standalone page
       // as opposed to embedded into a timeline
       type: Boolean,
       default: false,
     },
-    pinnedStatusIdsObject: {
-      // Used for user profile, map of pinned statuses
-      type: Object,
-      default: null,
-    },
-    inProfile: {
-      // Whether conversation is rendered in a user profile
-      // used for overriding muted status
-      type: Boolean,
-      default: false,
-    },
-    profileUserId: {
-      // used with inProfile, user id of the profile
-      type: String,
-      default: null,
-    },
     virtualHidden: {
       // Whether conversation is suspended. Controls rendering of statuses
       type: Boolean,
@@ -106,25 +69,18 @@ export default {
   },
   setup(props, ctx) {
     const { emit } = ctx
-    const {
-      statusId,
-      collapsable,
-      pinnedStatusIdsObject,
-      inProfile,
-      profileUserId,
-      virtualHidden,
-    } = toRefs(props)
-    const router = useRouter()
+    const { statusId } = toRefs(props)
 
-    const hoisted = {}
+    const router = useRouter()
 
     // # Main Configuration
     const { mergedConfig } = storeToRefs(useMergedConfigStore())
     const { mastoUserSocketStatus } = storeToRefs(useStreamingStore())
     const displayStyle = computed(() => mergedConfig.value.conversationDisplay)
-    const streamingEnabled = computed(() =>
-      mergedConfig.value.useStreamingApi &&
-        mastoUserSocketStatus === WSConnectionStatus.JOINED
+    const streamingEnabled = computed(
+      () =>
+        mergedConfig.value.useStreamingApi &&
+        mastoUserSocketStatus === WSConnectionStatus.JOINED,
     )
 
     // # Main things
@@ -146,6 +102,24 @@ export default {
         return statusId.value
       }
     })
+
+    const sortById = (a, b) => {
+      const idA = a.type === 'retweet' ? a.retweeted_status.id : a.id
+      const idB = b.type === 'retweet' ? b.retweeted_status.id : b.id
+      const seqA = Number(idA)
+      const seqB = Number(idB)
+      const isSeqA = !Number.isNaN(seqA)
+      const isSeqB = !Number.isNaN(seqB)
+      if (isSeqA && isSeqB) {
+        return seqA < seqB ? -1 : 1
+      } else if (isSeqA && !isSeqB) {
+        return -1
+      } else if (!isSeqA && isSeqB) {
+        return 1
+      } else {
+        return idA < idB ? -1 : 1
+      }
+    }
     const conversationId = computed(() => getConversationId(statusId.value))
     const conversation = computed(() => {
       if (!status.value) {
@@ -167,11 +141,7 @@ export default {
     })
     const replies = computed(() =>
       conversation.value.reduce(
-        (
-          result,
-          { id, in_reply_to_status_id: irid },
-          index,
-        ) => {
+        (result, { id, in_reply_to_status_id: irid }, index) => {
           if (irid) {
             if (!result.has(irid)) {
               result.set(irid, new Set())
@@ -184,18 +154,18 @@ export default {
           return result
         },
         new Map(),
-      )
+      ),
     )
     const getReplies = (id) => replies.value.get(id) ?? new Set()
 
+    provide('conversation', conversation)
+    provide('replies', replies)
+
     const fetchConversation = async () => {
       if (status.value) {
         const {
-          data: {
-            ancestors,
-            descendants
-          },
-          timestamp
+          data: { ancestors, descendants },
+          timestamp,
         } = await apiFetchConversation({
           id: statusId.value,
           credentials: useOAuthStore().token,
@@ -225,11 +195,12 @@ export default {
       }
     }
     const resetDisplayState = () => {
-      hoisted.undive()
+      setFocused(statusId.value)
       threadDisplay.value = new Map()
     }
 
     // # Virtual scrolling stuff
+    const { virtualHidden } = toRefs(props)
     const unsuspendibleIds = ref(new Set())
     const suspendable = computed(() => unsuspendibleIds.value.size === 0)
     const hide = computed(() => virtualHidden.value && suspendable.value)
@@ -243,13 +214,13 @@ export default {
 
     // # Misc UI things
     const loadStatusError = ref(null)
-
     const { layoutType } = storeToRefs(useInterfaceStore())
     const mobileLayout = computed(() => layoutType.value === 'mobile')
     const firstStatus = computed(() => conversation.value[0])
-    const lastStatus = computed(() => conversation.value[conversation.value.legnth - 1])
+    const lastStatus = computed(
+      () => conversation.value[conversation.value.legnth - 1],
+    )
     const getStatusClasses = (status, active) => ({
-      '-virtual-active': active,
       '-first': status.id === firstStatus.value?.id,
       '-last': status.id === lastStatus.value?.id,
     })
@@ -268,13 +239,15 @@ export default {
         resetDisplayState()
       }
     })
+    provide('isExpanded', isExpanded)
+    provide('isPage', isPage)
 
     // # Focus
-    const focused = ref(null)
-    const maybeFocused = computed(() => isExpanded.value ? focused.value : null)
+    const focusedId = ref(statusId.value)
+    const focused = computed(() => (isExpanded.value ? focusedId.value : null))
     const setFocused = (id) => {
       if (!id) return
-      focused.value = id
+      focusedId.value = id
 
       if (!streamingEnabled.value) {
         useStatusesStore().fetchStatus(id)
@@ -296,6 +269,7 @@ export default {
         fetchConversation()
       }
     })
+    provide('focused', focused)
 
     // Component created
     if (isPage.value) {
@@ -309,11 +283,15 @@ export default {
     const isTreeView = computed(() => displayStyle.value === 'tree')
 
     // ## Tree view settings
-    const treeViewIsSimple = computed(() => !mergedConfig.value.conversationTreeAdvanced)
-    const shouldFadeAncestors = computed(() => mergedConfig.value.conversationTreeFadeAncestors)
-    const otherRepliesButtonPosition = computed(() => mergedConfig.value.conversationOtherRepliesButton)
-    const showOtherRepliesButtonBelowStatus = computed(() => otherRepliesButtonPosition.value === 'below')
-    const showOtherRepliesButtonInsideStatus = computed(() => otherRepliesButtonPosition.value === 'inside')
+    const treeViewIsSimple = computed(
+      () => !mergedConfig.value.conversationTreeAdvanced,
+    )
+    const shouldFadeAncestors = computed(
+      () => mergedConfig.value.conversationTreeFadeAncestors,
+    )
+    const showOtherRepliesButtonBelowStatus = computed(
+      () => mergedConfig.value.conversationOtherRepliesButton === 'below',
+    )
     const maxDepthToShowByDefault = computed(() => {
       // maxDepthInThread = max number of depths that is *visible*
       // since our depth starts with 0 and "showing" means "showing children"
@@ -323,19 +301,12 @@ export default {
     })
 
     // ## Tree style state
-    // ### Dive
-    const inlineDivePosition = ref(null)
-    const currentStatusId = computed(() => inlineDivePosition.value ?? statusId.value)
-
     // ### Topology
     const ancestors = computed(() => {
       // First we fill map with empty sets and add given id's parent
       // as set's only element (if any)
       const parentMap = conversation.value.reduce(
-        (
-          result,
-          { id, in_reply_to_status_id: irid },
-        ) => {
+        (result, { id, in_reply_to_status_id: irid }) => {
           if (!result.has(id)) {
             result.set(id, new Set())
           }
@@ -345,7 +316,7 @@ export default {
           }
           return result
         },
-        new Map()
+        new Map(),
       )
 
       // Next we iterate over each entry and fill the whole ancestry chain
@@ -361,15 +332,19 @@ export default {
       })
       return parentMap
     })
-    const getAncestorIds = (id) => ancestors.value.get(id) ?? new Set()
-    const getAncestors = (id) => [...getAncestorIds(id)].map(getStatusObject).filter(Boolean)
-    const currentAncestors = computed(() => getAncestors(currentStatusId.value).reverse())
-    const currentDepth = computed(() => currentAncestors.value.length)
-    const topLevel = computed(() => [...ancestors.value.entries()]
-      .filter(([id, ancestors]) => ancestors.size === 0)
-      .map(([id]) => getStatusObject(id))
+    const topLevel = computed(() =>
+      [...ancestors.value.entries()]
+        .filter(([id, ancestors]) => ancestors.size === 0)
+        .map(([id]) => getStatusObject(id)),
     )
-    const currentStatus = computed(() => getStatusObject(currentStatusId.value))
+    const getAncestorIds = (id) => ancestors.value.get(id) ?? new Set()
+    const getAncestors = (id) =>
+      [...getAncestorIds(id)].map(getStatusObject).filter(Boolean)
+    const currentAncestors = computed(() =>
+      getAncestors(focusedId.value).reverse(),
+    )
+    const currentDepth = computed(() => currentAncestors.value.length)
+    const currentStatus = computed(() => getStatusObject(focusedId.value))
 
     // ### Thread Display
     const threadDisplay = ref(new Map()) // id => 'showing' | 'hidden'
@@ -390,6 +365,8 @@ export default {
         return map
       }, new Map())
     })
+    provide('threadDisplay', threadDisplay)
+    provide('threadDisplayDefault', threadDisplayDefault)
 
     const setThreadDisplayRecursively = (id, value) => {
       threadDisplay.value.set(id, value)
@@ -402,8 +379,12 @@ export default {
     }
 
     // ## Derived values
-    const shouldShowAllConversationButton = computed(() => currentAncestors.value.length > 0 && topLevel.value.length > 1)
-    const shouldShowAncestors = computed(() => isExpanded.value && ancestors.value.get(currentStatusId.value) != null)
+    const shouldShowAllConversationButton = computed(
+      () => currentAncestors.value.length > 0 && topLevel.value.length > 1,
+    )
+    const shouldShowAncestors = computed(
+      () => isExpanded.value && ancestors.value.get(focusedId.value) != null,
+    )
 
     // # Scrolling / diving
     const tryScrollTo = (id) => {
@@ -412,8 +393,6 @@ export default {
       }
       if (isPage.value) {
         router.push({ name: 'conversation', params: { statusId: id } })
-      } else {
-        inlineDivePosition.value = id
       }
       // Because the conversation can be unmounted when out of sight
       // and mounted again when it comes into sight,
@@ -434,47 +413,32 @@ export default {
         setFocused(id)
       })
     }
-    const goToCurrent = () => {
-      tryScrollTo(diveRoot)
-    }
     const diveIntoStatus = (id) => {
       tryScrollTo(id)
     }
     const diveToTopLevel = () => {
       tryScrollTo(currentAncestors.value[0].id)
     }
-    const undive = () => {
-      inlineDivePosition.value = null
-      setFocused(statusId.value)
-    }
-    hoisted.undive = undive
 
     return {
-      ...hoisted,
+      hide,
       isLinearView,
       isTreeView,
       isExpanded,
       conversation,
-      hide,
-      collapsable,
       mobileLayout,
       toggleExpanded,
       isPage,
       status,
       loadStatusError,
-      maybeFocused,
+      focused,
       setFocused,
       showOtherRepliesButtonBelowStatus,
-      showOtherRepliesButtonInsideStatus,
       onStatusSuspendStateChange,
       getStatusClasses,
       getReplies,
       currentAncestors,
       statusId,
-      collapsable,
-      pinnedStatusIdsObject,
-      inProfile,
-      profileUserId,
       virtualHidden,
       shouldShowAncestors,
       shouldShowAllConversationButton,
@@ -489,5 +453,5 @@ export default {
       diveIntoStatus,
       showThreadRecursively,
     }
-  }
+  },
 }
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 87c52c814..b5d92401c 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -19,19 +19,19 @@
         </template>
       </h1>
       <button
-        v-if="collapsable"
+        v-if="!isPage"
         class="button-unstyled -link"
         @click.prevent="toggleExpanded"
       >
         {{ $t('timeline.collapse') }}
       </button>
       <QuickFilterSettings
-        v-if="!collapsable && mobileLayout"
+        v-if="isPage && mobileLayout"
         :conversation="true"
         class="rightside-button"
       />
       <QuickViewSettings
-        v-if="!collapsable"
+        v-if="isPage"
         :conversation="true"
         class="rightside-button"
       />
@@ -86,93 +86,61 @@
             </template>
           </i18n-t>
         </div>
-        <DynamicScroller
+        <div
           v-if="shouldShowAncestors"
           class="thread-ancestors"
-          :min-item-size="15"
-          :buffer="500"
-          :items="currentAncestors"
-          role="feed"
-          list-tag="article"
-          item-tag="article"
-          :item-class="{'thread-ancestor-has-other-replies': getReplies(status.id).size > 1, '-faded': shouldFadeAncestors, 'thread-ancestor': true }"
-          flow-mode
-          page-mode
         >
-          <template #default="{ item: status, active }">
-            <DynamicScrollerItem
-              :item="status"
-              :active="active"
+          <article
+            v-for="status in currentAncestors"
+            class="thread-ancestor"
+            :class="{'thread-ancestor-has-other-replies': getReplies(status.id).length > 1, '-faded': shouldFadeAncestors}"
+          >
+            <Status
+              class="conversation-status panel-body"
+              :class="getStatusClasses(status)"
+
+              :status-id="status.id"
+              :replies="getReplies(status.id)"
+
+              :focused="focused === status.id"
+              can-dive
+
+              @goto="setFocused"
+              @dive="() => diveIntoStatus(status.id)"
+              @suspendable-state-change="onStatusSuspendStateChange"
+            />
+            <div
+              v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).size > 1"
+              class="thread-ancestor-dive-box"
             >
-              <Status
-                class="conversation-status panel-body"
-                :class="getStatusClasses(status, active)"
-
-                :status-id="status.id"
-                :replies="getReplies(status.id)"
-
-                :expandable="!isExpanded"
-                :focused="maybeFocused === status.id"
-                :inline-expanded="collapsable && isExpanded"
-                :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
-                :in-profile="inProfile"
-                :in-conversation="isExpanded"
-                :profile-user-id="profileUserId"
-                :show-other-replies-as-button="showOtherRepliesButtonInsideStatus"
-                can-dive
-
-                @goto="setFocused"
-                @dive="() => diveIntoStatus(status.id)"
-                @suspendable-state-change="onStatusSuspendStateChange"
-              />
               <div
-                v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).size > 1"
-                class="thread-ancestor-dive-box"
+                class="thread-ancestor-dive-box-inner"
               >
-                <div
-                  class="thread-ancestor-dive-box-inner"
+                <i18n-t
+                  tag="button"
+                  scope="global"
+                  keypath="status.ancestor_follow_with_icon"
+                  class="button-unstyled -link thread-tree-show-replies-button"
+                  @click.prevent="diveIntoStatus(status.id)"
                 >
-                  <i18n-t
-                    tag="button"
-                    scope="global"
-                    keypath="status.ancestor_follow_with_icon"
-                    class="button-unstyled -link thread-tree-show-replies-button"
-                    @click.prevent="diveIntoStatus(status.id)"
-                  >
-                    <template #icon>
-                      <FAIcon
-                        icon="angle-double-right"
-                      />
-                    </template>
-                    <template #text>
-                      <span>
-                        {{ $t('status.ancestor_follow', { numReplies: getReplies(status.id, getReplies(status.id).size - 1).size - 1 }) }}
-                      </span>
-                    </template>
-                  </i18n-t>
-                </div>
+                  <template #icon>
+                    <FAIcon
+                      icon="angle-double-right"
+                    />
+                  </template>
+                  <template #text>
+                    <span>
+                      {{ $t('status.ancestor_follow', { numReplies: getReplies(status.id, getReplies(status.id).size - 1).size - 1 }) }}
+                    </span>
+                  </template>
+                </i18n-t>
               </div>
-            </DynamicScrollerItem>
-          </template>
-        </DynamicScroller>
+            </div>
+          </article>
+        </div>
         <ThreadTree
-          :key="currentStatus.id"
-          :depth="0"
-
           :status-id="currentStatus.id"
-          :in-profile="inProfile"
-          :conversation="conversation"
-          :collapsable="collapsable"
-          :is-expanded="isExpanded"
-          :pinned-status-ids-object="pinnedStatusIdsObject"
-          :profile-user-id="profileUserId"
-
-          :replies="replies"
-          :focused="maybeFocused"
-
-          :thread-display="threadDisplay"
-          :thread-display-default="threadDisplayDefault"
-          :can-dive="isExpanded"
+          :depth="0"
 
           @goto="setFocused"
           @dive="diveIntoStatus"
@@ -201,17 +169,11 @@
             <Status
               :key="status.id"
               class="conversation-status"
-              :class="getStatusClasses(status, active)"
+              :class="getStatusClasses(status)"
               :status-id="status.id"
               :replies="getReplies(status.id)"
 
-              :expandable="!isExpanded"
-              :focused="maybeFocused === status.id || maybeFocused === status.retweeted_status?.id"
-              :inline-expanded="collapsable && isExpanded"
-              :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
-              :in-profile="inProfile"
-              :in-conversation="isExpanded"
-              :profile-user-id="profileUserId"
+              :focused="focused === status.id || focused === status.retweeted_status?.id"
 
               @goto="setFocused"
               @toggle-expanded="toggleExpanded"
diff --git a/src/components/quote/quote.vue b/src/components/quote/quote.vue
index f518db7ab..bdfc4f930 100644
--- a/src/components/quote/quote.vue
+++ b/src/components/quote/quote.vue
@@ -27,7 +27,7 @@
     <Status
       v-if="shouldDisplayQuote"
       :statusoid="quotedStatus"
-      :in-quote="true"
+      in-quote
     />
   </article>
   <p
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 8ad8d684b..bd6144971 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -98,19 +98,12 @@ const Status = {
     statusoid: Object,
     replies: Set,
 
-    expandable: Boolean,
     focused: Boolean,
     compact: Boolean,
     isPreview: Boolean,
     noHeading: Boolean,
-    inlineExpanded: Boolean,
-    inProfile: Boolean,
-    inConversation: Boolean,
     inQuote: Boolean,
 
-    profileUserId: String,
-    showOtherRepliesAsButton: Boolean,
-    canDive: Boolean,
     ignoreMute: Boolean,
 
     threadDisplayState: String,
@@ -122,6 +115,11 @@ const Status = {
     'suspendableStateChange',
     'heightChange',
   ],
+  inject: {
+    profileUserId: { default: null },
+    isPage: { default: false },
+    isExpanded: { default: false },
+  },
   data() {
     return {
       replying: false,
@@ -139,6 +137,12 @@ const Status = {
     status() {
       return this.statusoid ?? useStatusesStore().allStatuses.get(this.statusId)
     },
+    inConversation() {
+      return this.isExpanded
+    },
+    inProfile() {
+      return this.profileUserId != null
+    },
     // Status repeated
     repeatedStatus() {
       if (this.status.retweeted_status === undefined) return undefined
@@ -168,6 +172,9 @@ const Status = {
     simpleTree() {
       return !this.mergedConfig.conversationTreeAdvanced
     },
+    showOtherRepliesAsButton() {
+      return this.mergedConfig.conversationOtherRepliesButton === 'inside'
+    },
     showReasonMutedThread() {
       return (
         (this.mainStatus.thread_muted || this.repeatStatus?.thread_muted) &&
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4322c6033..86e33cbbf 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -3,7 +3,7 @@
     v-if="!hideStatus"
     ref="root"
     class="Status"
-    :class="[{ '-focused': focused }, { '-conversation': inlineExpanded }]"
+    :class="[{ '-focused': focused }, { '-conversation': !isPage && isExpanded }]"
   >
     <div
       v-if="error"
@@ -199,7 +199,7 @@
                   />
                 </span>
                 <button
-                  v-if="expandable && !isPreview"
+                  v-if="!isExpanded && !isPreview"
                   class="button-unstyled"
                   :title="$t('status.expand')"
                   @click.prevent="toggleExpanded"
@@ -235,7 +235,7 @@
                   />
                 </button>
                 <button
-                  v-if="canDive && !simpleTree"
+                  v-if="isExpanded && !simpleTree"
                   class="button-unstyled"
                   :title="$t('status.show_only_conversation_under_this')"
                   @click.prevent="$emit('dive')"
diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index 1fc6c8ae9..28497f5f5 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -293,8 +293,10 @@ export const BUTTONS = [
       navigator.clipboard.writeText(
         [
           useInstanceStore().server,
-          router.resolve({ name: 'conversation', params: { statusId: status.id } })
-            .href,
+          router.resolve({
+            name: 'conversation',
+            params: { statusId: status.id },
+          }).href,
         ].join(''),
       )
       return Promise.resolve()
diff --git a/src/components/thread_tree/thread_tree.js b/src/components/thread_tree/thread_tree.js
index 1c3b3560a..3d2fe3244 100644
--- a/src/components/thread_tree/thread_tree.js
+++ b/src/components/thread_tree/thread_tree.js
@@ -1,11 +1,11 @@
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faAngleDoubleDown,
   faAngleDoubleRight,
 } from '@fortawesome/free-solid-svg-icons'
 
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-
 library.add(faAngleDoubleDown, faAngleDoubleRight)
 
 const ThreadTree = {
@@ -13,20 +13,7 @@ const ThreadTree = {
   name: 'ThreadTree',
   props: {
     statusId: String,
-    inProfile: Boolean,
-    collapsable: Boolean,
-    isExpanded: Boolean,
-    pinnedStatusIdsObject: Object,
-    profileUserId: String,
-
     depth: Number,
-    conversation: Array,
-    focused: String,
-    replies: Map,
-
-    canDive: Boolean,
-    threadDisplay: Map,
-    threadDisplayDefault: Map,
   },
   emits: [
     'suspendableStateChange',
@@ -36,6 +23,15 @@ const ThreadTree = {
     'toggleExpanded',
     'showThreadRecursively',
   ],
+  inject: [
+    'conversation',
+    'focused',
+    'replies',
+    'threadDisplay',
+    'threadDisplayDefault',
+    'isExpanded',
+    'isPage',
+  ],
   computed: {
     currentReplies() {
       return [...this.getReplies(this.statusId)].map(({ id }) => id)
@@ -44,9 +40,14 @@ const ThreadTree = {
       return !useMergedConfigStore().mergedConfig.conversationTreeAdvanced
     },
     threadShowing() {
-      const result = this.threadDisplay.get(this.statusId) ?? this.threadDisplayDefault.get(this.statusId)
+      const result =
+        this.threadDisplay.get(this.statusId) ??
+        this.threadDisplayDefault.get(this.statusId)
       return result === 'showing'
     },
+    canDive() {
+      return this.isExpanded
+    },
     totalReplyCount() {
       const sizes = {}
       const subTreeSizeFor = (id) => {
@@ -92,7 +93,7 @@ const ThreadTree = {
     getReplies(id) {
       return this.replies.get(id) ?? new Set()
     },
-  }
+  },
 }
 
 export default ThreadTree
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index 3d21daa8d..7d4854487 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -2,20 +2,12 @@
   <article class="thread-tree">
     <Status
       :key="statusId"
-      ref="statusComponent"
+      class="conversation-status conversation-status-treeview panel-body"
       :status-id="statusId"
       :replies="getReplies(statusId)"
-      :inline-expanded="collapsable && isExpanded"
-      :expandable="!isExpanded"
-      :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
-      :in-conversation="isExpanded"
       :focused="focused === statusId"
-      :in-profile="inProfile"
-      :profile-user-id="profileUserId"
-      class="conversation-status conversation-status-treeview panel-body"
 
       :thread-display-state="threadDisplay.get(statusId)"
-      :can-dive="canDive"
 
       @dive="$emit('dive', statusId)"
       @goto="$emit('goto', statusId)"
@@ -30,24 +22,9 @@
       <ThreadTree
         v-for="replyStatusId in currentReplies"
         :key="replyStatusId"
-        ref="childComponent"
         :depth="depth + 1"
         :status-id="replyStatusId"
 
-        :in-profile="inProfile"
-        :conversation="conversation"
-        :collapsable="collapsable"
-        :is-expanded="isExpanded"
-        :pinned-status-ids-object="pinnedStatusIdsObject"
-        :profile-user-id="profileUserId"
-
-        :replies="replies"
-        :focused="focused"
-
-        :thread-display="threadDisplay"
-        :thread-display-default="threadDisplayDefault"
-
-        :can-dive="canDive"
         @show-thread-recursively="(e) => $emit('showThreadRecursively', e)"
         @goto="(e) => $emit('goto', e)"
         @dive="(e) => $emit('dive', e)"
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 1f4486647..79b8f493b 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -41,6 +41,11 @@ const Timeline = {
       blockingClicks: false,
     }
   },
+  provide() {
+    return {
+      profileUserId: this.inProfile && this.timelineRef.argument,
+    }
+  },
   components: {
     ScrollTopButton,
     Conversation,
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index a0087a68d..7a0be1a50 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -96,8 +96,6 @@
               :key="status.id"
               role="listitem"
               :status-id="status.id"
-              :in-profile="inProfile"
-              :profile-user-id="timelineRef.argument"
               collapsable
             />
           </DynamicScrollerItem>