diff --git a/Libraries/Core/Services/MailSendService.cs b/Libraries/Core/Services/MailSendService.cs
index 336a8749..1ce0a808 100644
--- a/Libraries/Core/Services/MailSendService.cs
+++ b/Libraries/Core/Services/MailSendService.cs
@@ -142,7 +142,14 @@ public class MailSendService(
         if (items?.Count > 0)
         {
             details.Items.AddRange(items);
-            details.ItemsMaxStorageLifetimeSeconds = maxStorageTimeSeconds ?? 172800;
+            if (maxStorageTimeSeconds is not null && maxStorageTimeSeconds > 0)
+            {
+                details.ItemsMaxStorageLifetimeSeconds = maxStorageTimeSeconds;
+            }
+            else
+            {
+                details.ItemsMaxStorageLifetimeSeconds = 172800;
+            }
         }
 
         if (systemData is not null)
@@ -571,7 +578,7 @@ public class MailSendService(
             };
         }
 
-        return dialogsInProfile[senderId]; ;
+        return dialogsInProfile[senderId];
     }
 
     /**