diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index df776836d1..f02f485f5d 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -1087,7 +1087,7 @@ public interface DaoMessage {
             " AND (ui_seen OR received < :keep_unread_time)" +
             " AND NOT ui_flagged" +
             " AND stored < :sync_time" + // moved, browsed
-            " AND (ui_snoozed IS NULL OR ui_snoozed =" + Long.MAX_VALUE + ")")
+            " AND ui_snoozed IS NULL")
     List<Long> getMessagesBefore(long folder, long sync_time, long keep_time, long keep_unread_time);
 
     @Query("DELETE FROM message" +
@@ -1097,7 +1097,7 @@ public interface DaoMessage {
             " AND (ui_seen OR received < :keep_unread_time)" +
             " AND NOT ui_flagged" +
             " AND stored < :sync_time" + // moved, browsed
-            " AND (ui_snoozed IS NULL OR ui_snoozed = " + Long.MAX_VALUE + ")")
+            " AND ui_snoozed IS NULL")
     int deleteMessagesBefore(long folder, long sync_time, long keep_time, long keep_unread_time);
 
     @Transaction