diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index ce367281cc..9eaf36ff38 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -64,6 +64,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     private Message[] imessages = null;
     private int index;
     private boolean searching = false;
+    private int loaded = 0;
 
     interface IBoundaryCallbackMessages {
         void onLoading();
@@ -111,6 +112,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
         return searching;
     }
 
+    int getLoaded() {
+        return loaded;
+    }
+
     @Override
     public void onZeroItemsLoaded() {
         Log.i(Helper.TAG, "onZeroItemsLoaded");
@@ -196,6 +201,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                     if (db.message().getMessageByUid(fid, uid) == null) {
                                         ServiceSynchronize.synchronizeMessage(context, folder, ifolder, (IMAPMessage) isub[j], true);
                                         count++;
+                                        loaded++;
                                     }
                                 } catch (MessageRemovedException ex) {
                                     Log.w(Helper.TAG, "Boundary " + ex + "\n" + Log.getStackTraceString(ex));
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 4780816bca..e6e811cf08 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -708,12 +708,15 @@ public class FragmentMessages extends FragmentEx {
                         new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
                             @Override
                             public void onLoading() {
+                                tvNoEmail.setVisibility(View.GONE);
                                 pbWait.setVisibility(View.VISIBLE);
                             }
 
                             @Override
                             public void onLoaded() {
                                 pbWait.setVisibility(View.GONE);
+                                if (searchCallback.getLoaded() == 0)
+                                    tvNoEmail.setVisibility(View.VISIBLE);
                             }
 
                             @Override
@@ -751,8 +754,9 @@ public class FragmentMessages extends FragmentEx {
                     pbWait.setVisibility(View.GONE);
                 grpReady.setVisibility(View.VISIBLE);
 
-                if (messages.size() == 0 && !searching) {
-                    tvNoEmail.setVisibility(View.VISIBLE);
+                if (messages.size() == 0) {
+                    if (searchCallback == null)
+                        tvNoEmail.setVisibility(View.VISIBLE);
                     rvMessage.setVisibility(View.GONE);
                 } else {
                     tvNoEmail.setVisibility(View.GONE);