diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
index 22aa9d01fd..177b0c04b1 100644
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@@ -124,7 +124,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
             @Override
             public void run() {
                 try {
-                    if (destroyed)
+                    if (destroyed || error)
                         return;
 
                     fetched = 0;
@@ -227,16 +227,13 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
     private int load_server() throws MessagingException, IOException, AuthenticatorException, OperationCanceledException {
         DB db = DB.getInstance(context);
 
-        if (destroyed || error)
-            return 0;
-
         final EntityFolder browsable = db.folder().getBrowsableFolder(folder, query != null);
         if (browsable == null)
-            return 0;
+            return -1;
 
         EntityAccount account = db.account().getAccount(browsable.account);
         if (account == null)
-            return 0;
+            return -1;
 
         if (imessages == null)
             try {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c32a72ed5c..9286a150b1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2664,7 +2664,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             Integer submitted = (Integer) rvMessage.getTag();
             if (submitted == null)
                 submitted = 0;
-            if (submitted + fetched == 0)
+            if (submitted + fetched == 0 && fetched >= 0)
                 tvNoEmail.setVisibility(View.VISIBLE);
         }