diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index de96708b9c..a69f37a959 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -112,8 +112,22 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     }
 
     State setCallback(IBoundaryCallbackMessages intf) {
+        Log.i("Boundary callback=" + intf);
+        if (Objects.equals(intf, this.intf))
+            return this.state;
+
         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 c1b5c2b42e..286dc5b551 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4822,25 +4822,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         }
                 }
             });
-        } else if (viewType == AdapterMessage.ViewType.SEARCH && !reset) {
-            new SimpleTask<Void>() {
-                @Override
-                protected Void onExecute(Context context, Bundle args) {
-                    DB.getInstance(context).message().resetSearch();
-                    return null;
-                }
-
-                @Override
-                protected void onExecuted(Bundle args, Void data) {
-                    reset = true;
-                    loadMessagesNext(top);
-                }
-
-                @Override
-                protected void onException(Bundle args, Throwable ex) {
-                    Log.unexpectedError(getParentFragmentManager(), ex);
-                }
-            }.execute(this, new Bundle(), "search:reset");
         } else
             loadMessagesNext(top);
     }