diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 90d4673b43..2bcb966dcb 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -133,15 +133,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         this.intf = intf;
         this.state = new State();
 
-        if (criteria != null)
-            executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    Log.i("Boundary reset search");
-                    DB.getInstance(context).message().resetSearch();
-                }
-            });
-
         return this.state;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d9508e8d64..8e4a3e396e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -10030,6 +10030,18 @@ public class FragmentMessages extends FragmentBase
         if (manager.isDestroyed())
             return;
 
+        DB db = DB.getInstance(context);
+        db.getQueryExecutor().execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    db.message().resetSearch();
+                } catch (Throwable ex) {
+                    Log.e(ex);
+                }
+            }
+        });
+
         Bundle args = new Bundle();
         args.putLong("account", account);
         args.putLong("folder", folder);