diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 155b0c3a5a..2336d466b3 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -195,13 +195,13 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                             " snoozed=" + snoozed +
                             " offset=" + state.offset +
                             " size=" + state.matches.size());
-                    if (state.matches.size() == 0)
-                        break;
-
                     state.offset += Math.min(state.matches.size(), SEARCH_LIMIT);
                     state.index = 0;
                 }
 
+                if (state.matches.size() == 0)
+                    break;
+
                 for (int i = state.index; i < state.matches.size() && found < pageSize && !state.destroyed; i++) {
                     state.index = i + 1;