Tusker/Screens/Timeline/TimelineViewController.swift

@@ -719,11 +719,7 @@ class TimelineViewController: UIViewController, TimelineLikeCollectionViewContro
                 // there is no existing gap
                 applySnapshotBeforeScrolling = true
             }
-            if let first = currentItems.first {
+            snapshot.insertItems([.gap], beforeItem: currentItems.first!)
-                snapshot.insertItems([.gap], beforeItem: first)
-            } else {
-                snapshot.appendItems([.gap], toSection: .statuses)
-            }
             snapshot.insertItems(presentItems.map { .status(id: $0, collapseState: .unknown, filterState: .unknown) }, beforeItem: .gap)
             
             if applySnapshotBeforeScrolling {

Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift

@@ -218,9 +218,9 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         ])
     }
     
-    private let accountDetailToContentWarningSpacer = UIView().configure {
+    private let accountDetailToContentSpacer = UIView().configure {
         $0.backgroundColor = .clear
-        $0.heightAnchor.constraint(equalToConstant: 4).isActive = true
+        $0.heightAnchor.constraint(equalToConstant: 8).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,
-        accountDetailToContentWarningSpacer,
+        accountDetailToContentSpacer,
         contentWarningLabel,
         contentWarningToCollapseButtonSpacer,
         collapseButton,
@@ -330,8 +330,6 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
         self.statusState = state
         
         doUpdateUI(status: status)
-        accountDetailToContentWarningSpacer.isHidden = collapseButton.isHidden
-        contentWarningToCollapseButtonSpacer.isHidden = collapseButton.isHidden
         
         accountDetailAccessibilityElement.navigationDelegate = delegate
         accountDetailAccessibilityElement.accountID = accountID