diff --git a/components/notes/note.vue b/components/notes/note.vue
index 3f818f4..e7a286a 100644
--- a/components/notes/note.vue
+++ b/components/notes/note.vue
@@ -1,14 +1,17 @@
 <template>
-    <Card as="article" class="rounded-none border-0 duration-200 shadow- max-w-full">
+    <Card as="article" class="rounded-none border-0 duration-200 shadow- max-w-full relative">
         <CardHeader class="pb-4" as="header">
             <ReblogHeader v-if="note.reblog" :avatar="note.account.avatar" :display-name="note.account.display_name"
                 :url="reblogAccountUrl" :emojis="note.account.emojis" />
             <Header :author="noteToUse.account" :author-url="accountUrl"
                 :corner-avatar="note.reblog ? note.account.avatar : undefined" :note-url="url"
                 :visibility="noteToUse.visibility" :created-at="new Date(noteToUse.created_at)"
-                :small-layout="smallLayout" />
+                :small-layout="smallLayout" class="z-[1]" />
+            <div v-if="topAvatarBar" :class="cn('shrink-0 bg-border w-0.5 absolute top-0 h-7 left-[3.25rem]')"></div>
+            <div v-if="bottomAvatarBar" :class="cn('shrink-0 bg-border w-0.5 absolute bottom-0 h-[calc(100%-1.5rem)] left-[3.25rem]')"></div>
         </CardHeader>
-        <CardContent>
+        <!-- Simply offset by the size of avatar + 0.75rem (the gap) -->
+        <CardContent :class="contentUnderUsername && (smallLayout ? 'ml-11' : 'ml-[4.25rem]')">
             <Content :content="noteToUse.content" :quote="note.quote ?? undefined"
                 :attachments="noteToUse.media_attachments" :plain-content="noteToUse.plain_content ?? undefined"
                 :emojis="noteToUse.emojis" :sensitive="noteToUse.sensitive" :content-warning="noteToUse.spoiler_text" />
@@ -26,6 +29,7 @@
 </template>
 
 <script setup lang="ts">
+import { cn } from "@/lib/utils";
 import type { Status } from "@versia/client/types";
 import { Card, CardFooter, CardHeader } from "../ui/card";
 import Actions from "./actions.vue";
@@ -37,6 +41,9 @@ const { note } = defineProps<{
     note: Status;
     hideActions?: boolean;
     smallLayout?: boolean;
+    contentUnderUsername?: boolean;
+    topAvatarBar?: boolean;
+    bottomAvatarBar?: boolean;
 }>();
 
 // Notes can be reblogs, in which case the actual thing to render is inside the reblog property
diff --git a/components/notes/thread.vue b/components/notes/thread.vue
new file mode 100644
index 0000000..b73030d
--- /dev/null
+++ b/components/notes/thread.vue
@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <Note v-if="parent" :note="parent" :hide-actions="true" :content-under-username="true" :bottom-avatar-bar="true" />
+        <Note :note="note" :top-avatar-bar="!!parent" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+import type { Status } from "@versia/client/types";
+import Note from "./note.vue";
+
+const { note } = defineProps<{
+    note: Status;
+}>();
+
+const parent = useNote(client, note.in_reply_to_id);
+</script>
diff --git a/components/timelines/timeline-item.vue b/components/timelines/timeline-item.vue
index 9373171..52a8b75 100644
--- a/components/timelines/timeline-item.vue
+++ b/components/timelines/timeline-item.vue
@@ -5,7 +5,7 @@
 
 <script lang="ts" setup>
 import type { Notification, Status } from "@versia/client/types";
-import Note from "../notes/note.vue";
+import Thread from "../notes/thread.vue";
 import NotificationItem from "../notifications/notification.vue";
 
 const props = defineProps<{
@@ -15,11 +15,11 @@ const props = defineProps<{
 
 const itemComponent = computed(() => {
     if (props.type === "status") {
-        return Note;
+        return Thread;
     }
     if (props.type === "notification") {
         return NotificationItem;
     }
     return null;
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/pages/[username]/[uuid].vue b/pages/[username]/[uuid].vue
index de5ab61..e5a954f 100644
--- a/pages/[username]/[uuid].vue
+++ b/pages/[username]/[uuid].vue
@@ -1,7 +1,10 @@
 <template>
     <div v-if="loaded" class="mx-auto max-w-2xl w-full pb-72 *:rounded space-y-4 *:border">
-        <Note v-for="note of context?.ancestors" :note="note" />
-        <Note v-if="note" :note="note" />
+        <div>
+            <Note v-for="note, index of context?.ancestors" :note="note" :hide-actions="true"
+                :top-avatar-bar="index !== 0" :bottom-avatar-bar="true" :content-under-username="true" />
+            <Note v-if="note" :note="note" :top-avatar-bar="true" />
+        </div>
         <Note v-for="note of context?.descendants" :note="note" />
     </div>