diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index f0e118e5..9aea7b20 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -220,7 +220,6 @@
     //border-left: 2px solid var(--border, $fallback--border);
   }
 
-  /* HACK: we want the border width to scale with the status *below it* */
   .conversation-status {
     border-bottom-width: 1px;
     border-bottom-style: solid;
@@ -229,10 +228,18 @@
   }
 
   .thread-ancestor-has-other-replies .conversation-status,
+  .thread-ancestor:last-child .conversation-status,
+  .thread-ancestor:last-child .thread-ancestor-dive-box,
   &.-expanded .thread-tree .conversation-status {
     border-bottom: none;
   }
 
+  .thread-ancestors + .thread-tree > .conversation-status {
+    border-top-width: 1px;
+    border-top-style: solid;
+    border-top-color: var(--border, $fallback--border);
+  }
+
   /* expanded conversation in timeline */
   &.status-fadein.-expanded .thread-body {
     border-left-width: 4px;