diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index b8fb5383a2..77477fe953 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -403,7 +403,7 @@ export default class Status extends ImmutablePureComponent {
                   notificationId={this.props.notificationId}
                 />
               ) : null}
-              {!muted ? (
+              {!muted || isExpanded !== false ? (
                 <StatusHeader
                   status={status}
                   friend={account}
@@ -429,7 +429,7 @@ export default class Status extends ImmutablePureComponent {
             parseClick={parseClick}
             disabled={!router}
           />
-          {isExpanded !== false && !muted ? (
+          {isExpanded !== false || !muted ? (
             <StatusActionBar
               {...other}
               status={status}
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 15727155b2..1d1cf0f9e5 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -154,7 +154,6 @@
   padding: 8px 10px;
   position: relative;
   height: auto;
-  min-height: 48px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: default;
 
@@ -245,11 +244,21 @@
       height: 20px;
       overflow: hidden;
       text-overflow: ellipsis;
+      margin: 0;
+      padding-top: 0;
 
       a:hover {
         text-decoration: none;
       }
     }
+
+    .notification__message {
+      margin-bottom: 0;
+    }
+
+    .status__info .notification__message > span {
+      white-space: nowrap;
+    }
   }
 
   .notification__message {
@@ -293,19 +302,23 @@
 
 .status__info {
   display: flex;
-  padding: 2px 0 5px;
   font-size: 15px;
-  line-height: 24px;
 
   > span {
+    text-overflow: ellipsis;
     overflow: hidden;
   }
+
+  .notification__message > span {
+    word-wrap: break-word;
+  }
 }
 
 .status__info__icons {
   margin-left: auto;
   display: flex;
-  align-items: baseline;
+  align-items: center;
+  height: 1em;
   color: lighten($ui-base-color, 26%);
 
   .status__visibility-icon {
@@ -542,12 +555,6 @@
       text-decoration: none;
     }
   }
-
-  .status__content {
-    margin-top: -15px;
-    margin-bottom: 0;
-    padding-top: 0;
-  }
 }
 
 .status__relative-time,