diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 516fd2d1ae..f4cf561ebe 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -325,7 +325,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                 db.endTransaction();
             }
 
-            return found;
+            if (state.ids.size() > 0)
+                return found;
         }
 
         while (found < pageSize && !state.destroyed) {