diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index 41e58c013d..f5e8215fb0 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -2336,7 +2336,8 @@ public abstract class DB extends RoomDatabase {
                                 "    AND folder.type = '" + EntityFolder.INBOX + "'" +
                                 "    AND NOT message.ui_hide)))" +
                                 " WHERE pop = " + EntityAccount.TYPE_POP +
-                                " AND NOT max_messages IS NULL");
+                                " AND NOT max_messages IS NULL" +
+                                " AND NOT leave_on_device");
                     }
                 }).addMigrations(new Migration(234, 233) {
                     @Override