diff --git a/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift b/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
index b7de6c8c..279c7d26 100644
--- a/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
+++ b/Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
@@ -218,9 +218,9 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         ])
     }
     
-    private let accountDetailToContentSpacer = UIView().configure {
+    private let accountDetailToContentWarningSpacer = UIView().configure {
         $0.backgroundColor = .clear
-        $0.heightAnchor.constraint(equalToConstant: 8).isActive = true
+        $0.heightAnchor.constraint(equalToConstant: 4).isActive = true
     }
     private let contentWarningToCollapseButtonSpacer = UIView().configure {
         $0.backgroundColor = .clear
@@ -237,7 +237,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
     
     private lazy var mainVStack = UIStackView(arrangedSubviews: [
         accountDetailContainerView,
-        accountDetailToContentSpacer,
+        accountDetailToContentWarningSpacer,
         contentWarningLabel,
         contentWarningToCollapseButtonSpacer,
         collapseButton,
@@ -330,6 +330,8 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         self.statusState = state
         
         doUpdateUI(status: status)
+        accountDetailToContentWarningSpacer.isHidden = collapseButton.isHidden
+        contentWarningToCollapseButtonSpacer.isHidden = collapseButton.isHidden
         
         accountDetailAccessibilityElement.navigationDelegate = delegate
         accountDetailAccessibilityElement.accountID = accountID