diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift
index 3aa05f6fed..e0caf9d1a6 100644
--- a/apps/ios/Shared/Model/ChatModel.swift
+++ b/apps/ios/Shared/Model/ChatModel.swift
@@ -571,7 +571,11 @@ struct CIMeta: Decodable {
 
 
 func timestampText(_ date: Date) -> String {
-    date.formatted(date: .omitted, time: .shortened)
+    let now = Calendar.current.dateComponents([.day, .hour], from: .now)
+    let dc = Calendar.current.dateComponents([.day, .hour], from: date)
+    return now.day == dc.day || ((now.day ?? 0) - (dc.day ?? 0) == 1 && (dc.hour ?? 0) >= 18 && (now.hour ?? 0) < 12)
+        ? date.formatted(date: .omitted, time: .shortened)
+        : String(date.formatted(date: .numeric, time: .omitted).prefix(5))
 }
 
 enum CIStatus: Decodable {
diff --git a/apps/ios/Shared/Views/Chat/ChatItemView.swift b/apps/ios/Shared/Views/Chat/ChatItemView.swift
index a2189b5979..e287e8c1ae 100644
--- a/apps/ios/Shared/Views/Chat/ChatItemView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItemView.swift
@@ -8,8 +8,6 @@
 
 import SwiftUI
 
-private var dateFormatter: DateFormatter?
-
 struct ChatItemView: View {
     var chatItem: ChatItem
     var width: CGFloat
@@ -23,14 +21,6 @@ struct ChatItemView: View {
     }
 }
 
-func getDateFormatter() -> DateFormatter {
-    if let df = dateFormatter { return df }
-    let df = DateFormatter()
-    df.dateFormat = "HH:mm"
-    dateFormatter = df
-    return df
-}
-
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{