diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 49216eb5e4..f1ba1ec9d2 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -569,19 +569,19 @@ public interface DaoMessage {
 
     @Query("SELECT id FROM message" +
             " WHERE folder = :folder" +
-            " AND received < :received" +
+            " AND received < :before" +
             " AND NOT uid IS NULL" +
             " AND (ui_seen OR :unseen)" +
             " AND NOT ui_flagged" +
             " AND NOT ui_browsed")
-    List<Long> getMessagesBefore(long folder, long received, boolean unseen);
+    List<Long> getMessagesBefore(long folder, long before, boolean unseen);
 
     @Query("DELETE FROM message" +
             " WHERE folder = :folder" +
-            " AND received < :received" +
+            " AND received < :before" +
             " AND NOT uid IS NULL" +
             " AND (ui_seen OR :unseen)" +
             " AND NOT ui_flagged" +
-            " AND (NOT ui_browsed OR stored < :received)")
-    int deleteMessagesBefore(long folder, long received, boolean unseen);
+            " AND (NOT ui_browsed OR stored < :before)")
+    int deleteMessagesBefore(long folder, long before, boolean unseen);
 }
\ No newline at end of file