diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 9f023b46e0..1f0c41d3a7 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -39,7 +39,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     interface IBoundaryCallbackMessages {
         void onLoading();
 
-        void onLoaded(boolean empty);
+        void onLoaded();
 
         void onError(Throwable ex);
     }
@@ -103,7 +103,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                     handler.post(new Runnable() {
                         @Override
                         public void run() {
-                            intf.onLoaded(model == null || model.isEmpty());
+                            intf.onLoaded();
                         }
                     });
                 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index f27ae7e4c0..7022e97b97 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1733,9 +1733,11 @@ public class FragmentMessages extends FragmentBase {
                             }
 
                             @Override
-                            public void onLoaded(boolean empty) {
+                            public void onLoaded() {
+                                RecyclerView.Adapter adapter = rvMessage.getAdapter();
+                                int items = (adapter == null ? 0 : adapter.getItemCount());
+                                tvNoEmail.setVisibility(items == 0 ? View.VISIBLE : View.GONE);
                                 pbWait.setVisibility(View.GONE);
-                                tvNoEmail.setVisibility(empty ? View.VISIBLE : View.GONE);
                             }
 
                             @Override
diff --git a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
index 4faa8c3472..dc25af5ddb 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelBrowse.java
@@ -64,7 +64,6 @@ public class ViewModelBrowse extends ViewModel {
         private int pageSize;
 
         int local = 0;
-        int matched = 0;
         List<Long> messages = null;
         IMAPStore istore = null;
         IMAPFolder ifolder = null;
@@ -84,13 +83,6 @@ public class ViewModelBrowse extends ViewModel {
         currentState.error = false;
     }
 
-    boolean isEmpty() {
-        final State state = currentState;
-        if (state == null)
-            return true;
-        return (state.matched == 0 && (state.imessages == null || state.imessages.length == 0));
-    }
-
     void load() throws MessagingException, IOException {
         final State state = currentState;
         if (state == null || state.error)
@@ -136,10 +128,8 @@ public class ViewModelBrowse extends ViewModel {
                     if (!match && message.content)
                         match = body.toLowerCase().contains(find);
 
-                    if (match) {
-                        state.matched++;
+                    if (match)
                         db.message().setMessageFound(message.account, message.thread);
-                    }
                 }
 
                 db.setTransactionSuccessful();