diff --git a/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift b/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
index e1296bc60..b1b2d5536 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/RoomHeaderView.swift
@@ -69,13 +69,18 @@ struct RoomHeaderView_Previews: PreviewProvider, TestablePreview {
             makeHeader(avatarURL: .mockMXCAvatar, verificationState: .notVerified)
             makeHeader(avatarURL: .mockMXCAvatar, verificationState: .verified)
             makeHeader(avatarURL: .mockMXCAvatar, verificationState: .verificationViolation)
+            makeHeader(avatarURL: .mockMXCAvatar,
+                       roomSubtitle: "Subtitle",
+                       verificationState: .verified)
         }
         .previewLayout(.sizeThatFits)
     }
     
     static func makeHeader(avatarURL: URL?,
+                           roomSubtitle: String? = nil,
                            verificationState: UserIdentityVerificationState) -> some View {
         RoomHeaderView(roomName: "Some Room name",
+                       roomSubtitle: roomSubtitle,
                        roomAvatar: .room(id: "1",
                                          name: "Some Room Name",
                                          avatarURL: avatarURL),
diff --git a/ElementX/Sources/Screens/ThreadTimelineScreen/View/ThreadTimelineScreen.swift b/ElementX/Sources/Screens/ThreadTimelineScreen/View/ThreadTimelineScreen.swift
index dd5e246bc..396dcf012 100644
--- a/ElementX/Sources/Screens/ThreadTimelineScreen/View/ThreadTimelineScreen.swift
+++ b/ElementX/Sources/Screens/ThreadTimelineScreen/View/ThreadTimelineScreen.swift
@@ -67,9 +67,6 @@ struct ThreadTimelineScreen: View {
                 // Using a button stops it from getting truncated in the navigation bar
                 .contentShape(.rect)
         }
-        if #available(iOS 26, *) {
-            ToolbarSpacer()
-        }
     }
     
     private var isAtBottomAndLive: Bool {
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png
index 0ab175ad0..507b6b20f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc0cdc8acbebb3c2baadb2bcb4c7ee71cec89f39453e839e11fe782df6948c93
-size 73716
+oid sha256:dae344ccfc330c8c842ce441fc614f91f3b00eb502accca23557efd03c9480c1
+size 96968
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png
index 0ab175ad0..507b6b20f 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPad-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc0cdc8acbebb3c2baadb2bcb4c7ee71cec89f39453e839e11fe782df6948c93
-size 73716
+oid sha256:dae344ccfc330c8c842ce441fc614f91f3b00eb502accca23557efd03c9480c1
+size 96968
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-en-GB-0.png
index 195c89be7..a621b8605 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-en-GB-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-en-GB-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e976095d663adc5bd9d2efaabea7428964578f46011e5b5064b3828dac0b939
-size 56159
+oid sha256:b3ff9854297e3c6dcee4181367080a2ec6192489e66470de043150ac9a10323a
+size 74611
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-pseudo-0.png
index 195c89be7..a621b8605 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-pseudo-0.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomHeaderView.iPhone-16-pseudo-0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e976095d663adc5bd9d2efaabea7428964578f46011e5b5064b3828dac0b939
-size 56159
+oid sha256:b3ff9854297e3c6dcee4181367080a2ec6192489e66470de043150ac9a10323a
+size 74611