diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 4322500fe8..19f769e5a3 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -45,13 +45,21 @@
     border-left: none;
     border-bottom-width: 1px;
     border-bottom-style: solid;
-    border-color: var(--border, $fallback--border);
+    border-bottom-color: var(--border, $fallback--border);
     border-radius: 0;
   }
 
   &.-expanded {
+    .conversation-status {
+      border-color: $fallback--border;
+      border-color: var(--border, $fallback--border);
+      border-left: 4px solid $fallback--cRed;
+      border-left: 4px solid var(--cRed, $fallback--cRed);
+    }
     .conversation-status:last-child {
       border-bottom: none;
+      border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
+      border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
     }
   }
 }
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 46088cf9d8..fec9f9e943 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -5,10 +5,6 @@ $status-margin: 0.75em;
 
 .Status {
   min-width: 0;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-  border-left: 4px $fallback--cRed;
-  border-left: 4px var(--cRed, $fallback--cRed);
 
   &:hover .avatar {
     --still-image-img: visible;