diff --git a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift b/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift
index 44f4e1aa1b..1ca603ca77 100644
--- a/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift
+++ b/submodules/TelegramUI/TelegramUI/ListMessageDateHeader.swift
@@ -15,7 +15,9 @@ private let timezoneOffset: Int32 = {
 }()
 
 func listMessageDateHeaderId(timestamp: Int32) -> Int64 {
-    var time: time_t = time_t(timestamp + timezoneOffset)
+    var unclippedValue: Int64 = min(Int64(Int32.max), Int64(timestamp) + Int64(timezoneOffset))
+    
+    var time: time_t = time_t(Int32(clamping: unclippedValue))
     var timeinfo: tm = tm()
     localtime_r(&time, &timeinfo)