diff --git a/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift b/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift
index 4c2961d2d..358df2343 100644
--- a/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift
+++ b/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift
@@ -79,8 +79,7 @@ extension RoomSummary {
                     avatarURL: nil,
                     heroes: [],
                     lastMessage: AttributedString("I do not wish to take the trouble to understand mysticism"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "14:56",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 0,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
@@ -103,8 +102,7 @@ extension Array where Element == RoomSummary {
                     avatarURL: nil,
                     heroes: [],
                     lastMessage: AttributedString("I do not wish to take the trouble to understand mysticism"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "14:56",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 0,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
@@ -122,8 +120,7 @@ extension Array where Element == RoomSummary {
                     avatarURL: .mockMXCAvatar,
                     heroes: [],
                     lastMessage: AttributedString("How do you see the Emperor then? You think he keeps office hours?"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "2:56 PM",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 2,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 2,
@@ -141,8 +138,7 @@ extension Array where Element == RoomSummary {
                     avatarURL: nil,
                     heroes: [],
                     lastMessage: try? AttributedString(markdown: "He certainly seemed no *mental genius* to me"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "Some time ago",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 3,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
@@ -160,8 +156,7 @@ extension Array where Element == RoomSummary {
                     avatarURL: nil,
                     heroes: [],
                     lastMessage: AttributedString("There's an archaic measure of time that's called the month"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "Just now",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 2,
                     unreadMentionsCount: 2,
                     unreadNotificationsCount: 2,
@@ -179,8 +174,7 @@ extension Array where Element == RoomSummary {
                     avatarURL: nil,
                     heroes: [],
                     lastMessage: AttributedString("Clearly, if Earth is powerful enough to do that, it might also be capable of adjusting minds in order to force belief in its radioactivity"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "1986",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 1,
                     unreadMentionsCount: 1,
                     unreadNotificationsCount: 1,
@@ -198,8 +192,7 @@ extension Array where Element == RoomSummary {
                     avatarURL: nil,
                     heroes: [],
                     lastMessage: AttributedString("Are you groping for the word 'paranoia'?"),
-                    lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: "きょうはじゅういちがつじゅういちにちです",
+                    lastMessageDate: .mock,
                     unreadMessagesCount: 6,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
@@ -218,7 +211,6 @@ extension Array where Element == RoomSummary {
                     heroes: [],
                     lastMessage: nil,
                     lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: nil,
                     unreadMessagesCount: 0,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
@@ -270,7 +262,6 @@ extension Array where Element == RoomSummary {
                     heroes: [],
                     lastMessage: nil,
                     lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: nil,
                     unreadMessagesCount: 0,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
@@ -289,7 +280,6 @@ extension Array where Element == RoomSummary {
                     heroes: [],
                     lastMessage: nil,
                     lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: nil,
                     unreadMessagesCount: 0,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
index 9de901244..8af3a70c8 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
@@ -243,7 +243,7 @@ extension HomeScreenRoom {
                   isDirect: summary.isDirect,
                   isHighlighted: isHighlighted,
                   isFavourite: summary.isFavourite,
-                  timestamp: summary.lastMessageFormattedTimestamp,
+                  timestamp: summary.lastMessageDate?.formattedMinimal(),
                   lastMessage: summary.lastMessage,
                   avatar: summary.avatar,
                   canonicalAlias: summary.canonicalAlias)
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
index 8a1230996..bfe2e6789 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
@@ -208,7 +208,6 @@ private extension HomeScreenRoom {
                                   heroes: [.init(userID: "@someone:somewhere.com")],
                                   lastMessage: nil,
                                   lastMessageDate: nil,
-                                  lastMessageFormattedTimestamp: nil,
                                   unreadMessagesCount: 0,
                                   unreadMentionsCount: 0,
                                   unreadNotificationsCount: 0,
@@ -237,7 +236,6 @@ private extension HomeScreenRoom {
                                   heroes: [.init(userID: "@someone:somewhere.com")],
                                   lastMessage: nil,
                                   lastMessageDate: nil,
-                                  lastMessageFormattedTimestamp: nil,
                                   unreadMessagesCount: 0,
                                   unreadMentionsCount: 0,
                                   unreadNotificationsCount: 0,
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift
index 1bbc05a5b..47a494e68 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift
@@ -153,7 +153,6 @@ private extension HomeScreenRoom {
                                   heroes: [.init(userID: "@someone:somewhere.com")],
                                   lastMessage: nil,
                                   lastMessageDate: nil,
-                                  lastMessageFormattedTimestamp: nil,
                                   unreadMessagesCount: 0,
                                   unreadMentionsCount: 0,
                                   unreadNotificationsCount: 0,
@@ -182,7 +181,6 @@ private extension HomeScreenRoom {
                                   heroes: [.init(userID: "@someone:somewhere.com")],
                                   lastMessage: nil,
                                   lastMessageDate: nil,
-                                  lastMessageFormattedTimestamp: nil,
                                   unreadMessagesCount: 0,
                                   unreadMentionsCount: 0,
                                   unreadNotificationsCount: 0,
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
index 287829ae9..d6ca56907 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
@@ -41,7 +41,6 @@ struct RoomSummary {
     let heroes: [UserProfileProxy]
     let lastMessage: AttributedString?
     let lastMessageDate: Date?
-    let lastMessageFormattedTimestamp: String?
     let unreadMessagesCount: UInt
     let unreadMentionsCount: UInt
     let unreadNotificationsCount: UInt
@@ -96,8 +95,7 @@ extension RoomSummary {
         avatarURL = nil
         heroes = []
         lastMessage = AttributedString(string)
-        lastMessageDate = .now
-        lastMessageFormattedTimestamp = "Now"
+        lastMessageDate = .mock
         unreadMessagesCount = hasUnreadMessages ? 1 : 0
         unreadMentionsCount = hasUnreadMentions ? 1 : 0
         unreadNotificationsCount = hasUnreadNotifications ? 1 : 0
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
index 5f8747575..e06d62fc9 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift
@@ -243,12 +243,10 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
         
         var attributedLastMessage: AttributedString?
         var lastMessageDate: Date?
-        var lastMessageFormattedTimestamp: String?
         
         if let latestRoomMessage = roomDetails.latestEvent {
             let lastMessage = EventTimelineItemProxy(item: latestRoomMessage, uniqueID: .init("0"))
             lastMessageDate = lastMessage.timestamp
-            lastMessageFormattedTimestamp = lastMessage.timestamp.formattedMinimal()
             attributedLastMessage = eventStringBuilder.buildAttributedString(for: lastMessage)
         }
         
@@ -274,7 +272,6 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol {
                            heroes: roomInfo.heroes.map(UserProfileProxy.init),
                            lastMessage: attributedLastMessage,
                            lastMessageDate: lastMessageDate,
-                           lastMessageFormattedTimestamp: lastMessageFormattedTimestamp,
                            unreadMessagesCount: UInt(roomInfo.numUnreadMessages),
                            unreadMentionsCount: UInt(roomInfo.numUnreadMentions),
                            unreadNotificationsCount: UInt(roomInfo.numUnreadNotifications),
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png
index cb016eeaa..3588131bc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:565e64e7517453e0a6e48bbd390db7b1a5ce37d9d79872f2e46926aa95696e3c
-size 253182
+oid sha256:4e891998fd95aa30f8c191deab533a059a9c1feb815ae5bf0852540c9b1e9ab4
+size 251107
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png
index f2dedc14e..dacf16417 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f28dd104e527d7b1a2f51f894e2e5859de52e84ecee25477303a017a541cf9d
-size 256291
+oid sha256:ecf700e5999db8abed896b329e74903335c481cce0e06dc7d6568561168c45ad
+size 255196
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-en-GB.png
index 5376d9b65..242549ac5 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3353d26ab3b1614883d67ebf9cf12e0e1ab6bf20980ed9c0b4ef5b1735d6960c
-size 189632
+oid sha256:28f525c2f84acf155af7b5eaa7d3c9726a7d0861fad83c7e5249925d57fefd81
+size 188085
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-pseudo.png
index de5f98b7e..94894d420 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreen.Loaded-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b079b832c36fa47a3b5ddfc70dcd204b2be0f7ac2e0d97ae96f4d69f5841ac43
-size 192431
+oid sha256:2582a1c209166a3488335a70697fb0be7c7c81228db2ca2198e4a959b9cff3f7
+size 190520
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-en-GB.png
index 338475634..18d347f9b 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33317db33390eb64018ae78b6e4c38f3e510969cba83f02d1e46130300f6e07c
-size 230470
+oid sha256:511bbebdefd00ca3169790a06c4286fda86e90a0c814b6327dbcd3b54aa9fa95
+size 228009
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-pseudo.png
index 338475634..dd4a27a51 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33317db33390eb64018ae78b6e4c38f3e510969cba83f02d1e46130300f6e07c
-size 230470
+oid sha256:79a8204c246186be948bfd1d1ac0ccf87edf3a047304705b077436540fad299a
+size 229275
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-en-GB.png
index 837933948..763310758 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2628e5ceec674b3990ac4200ae9fefd6161947032ded834a1ac8d2a54164f9d
-size 170879
+oid sha256:fba85304ab17f100b391904278da5b82fbaa458e3b53de446ba98d088c0908a1
+size 169063
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-pseudo.png
index 837933948..3f5fa95ab 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Generic-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2628e5ceec674b3990ac4200ae9fefd6161947032ded834a1ac8d2a54164f9d
-size 170879
+oid sha256:0586a60dc2d7cbc8d0679015b11e88e163c4ab2749233db1948685f52c69b8c0
+size 168689
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-en-GB.png
index 3bc2c5201..2ed10f49e 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1f866dbcd274f9176e3e9c7b015774b1d4983e09c4d6a36d2c0e7ef4c7497e0
-size 740365
+oid sha256:2d43ad3c8fa7a733329e6a547cb694710e4b310a541baba411e8a51c9f9557cc
+size 772355
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-pseudo.png
index 3bc2c5201..abd749ac2 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1f866dbcd274f9176e3e9c7b015774b1d4983e09c4d6a36d2c0e7ef4c7497e0
-size 740365
+oid sha256:00a0b4cc88502aeb5fc25550fb1ccb67f76d51e4da8d033eb26717e976e2f889
+size 778491
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-en-GB.png
index 4b26343f6..78ef1d3fa 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5775431191c8f71588376aec8f0d37c645093136ad8c8aca1dd1bafb2b7fa05
-size 516093
+oid sha256:47bd51437b8590eb51f4a0c7e3b990e61928517cfe48250d67796f2b0de1e735
+size 531654
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-pseudo.png
index 4b26343f6..0c1885f81 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/homeScreenRoomCell.Notifications-State-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5775431191c8f71588376aec8f0d37c645093136ad8c8aca1dd1bafb2b7fa05
-size 516093
+oid sha256:e359eddccaf1a28462d5b1f4c5a3a59cae2c9019c194500b6f8e0701e71f26e8
+size 535239
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png
index 75096223b..2f646ea86 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:641fcfd9cb6f688aee22aebcd7401e371c8136c93ae01c7f9cf599889e7edac0
-size 403620
+oid sha256:74fe3e6464e17d2e966cacd4d6fb06a9738a8d097ff19c354ebf1573a4e4290e
+size 392164
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png
index eb6555479..d3e39915c 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df1b0d57a7c3e2094cb506f0d4e296bc948fc722ed88fd237fe94e241d811475
-size 467930
+oid sha256:fc1c8e79b2417b48c5a4010b1c99dd91bfe97f3d8a2f83c30ac4f249b1868e4a
+size 456244
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png
index 3fda282b2..7e203b282 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd9df05fe2b178e18c8ccceb1f81c9f247b6a210be3d427a734d0f290a77ba6c
-size 752407
+oid sha256:c64bf07906a6e3497913c4f49a24140e11d6e90983d9b35d7fdc009a4d503843
+size 740216
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png
index 474329324..0c7d69f94 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efed1ac06f38b65d4985f5c8e0b6496d1365519f5ac30c04696d170ad5a0eaf1
-size 333024
+oid sha256:9a6811c53c8ee5cc8fc0d77a3c498b8fe3624b414d480492af15093b3d9a1a65
+size 327426
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png
index 01c7da9e6..45e9daccd 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fef8349d83cd4670207d898e3703052ee2a7df726fb9d35920e65a080f0d1fc
-size 470214
+oid sha256:6ba80b5b8665b78e0d54458274242d8f1437fe7f164e36d655a86af51491be01
+size 459905
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png
index 800ce620d..36bf9d996 100644
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cc5de6816de5e73c3e3741c360149922fe64c4a23b1f500a9c30b606ffc7ee3
-size 335716
+oid sha256:d5749b253752706df6d50b5678fa7514e84e1666fd05a08279f01ce2c4bf157e
+size 331941
diff --git a/UnitTests/Sources/HomeScreenRoomTests.swift b/UnitTests/Sources/HomeScreenRoomTests.swift
index 00bef4aac..cc9d37805 100644
--- a/UnitTests/Sources/HomeScreenRoomTests.swift
+++ b/UnitTests/Sources/HomeScreenRoomTests.swift
@@ -29,7 +29,6 @@ class HomeScreenRoomTests: XCTestCase {
                                   heroes: [],
                                   lastMessage: nil,
                                   lastMessageDate: nil,
-                                  lastMessageFormattedTimestamp: nil,
                                   unreadMessagesCount: unreadMessagesCount,
                                   unreadMentionsCount: unreadMentionsCount,
                                   unreadNotificationsCount: unreadNotificationsCount,
diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift
index 8d0291861..ed02b2134 100644
--- a/UnitTests/Sources/LoggingTests.swift
+++ b/UnitTests/Sources/LoggingTests.swift
@@ -86,8 +86,7 @@ class LoggingTests: XCTestCase {
                                       avatarURL: nil,
                                       heroes: [.init(userID: "", displayName: heroName)],
                                       lastMessage: AttributedString(lastMessage),
-                                      lastMessageDate: nil,
-                                      lastMessageFormattedTimestamp: "Now",
+                                      lastMessageDate: .mock,
                                       unreadMessagesCount: 0,
                                       unreadMentionsCount: 0,
                                       unreadNotificationsCount: 0,
diff --git a/UnitTests/Sources/RoomSummaryTests.swift b/UnitTests/Sources/RoomSummaryTests.swift
index 7d17d0c01..b5bc09329 100644
--- a/UnitTests/Sources/RoomSummaryTests.swift
+++ b/UnitTests/Sources/RoomSummaryTests.swift
@@ -63,7 +63,6 @@ class RoomSummaryTests: XCTestCase {
                     heroes: heroes,
                     lastMessage: nil,
                     lastMessageDate: nil,
-                    lastMessageFormattedTimestamp: nil,
                     unreadMessagesCount: 0,
                     unreadMentionsCount: 0,
                     unreadNotificationsCount: 0,