diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0da2ef0edc..618de39247 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1736,7 +1736,8 @@ public class FragmentMessages extends FragmentBase {
 
                         boolean refreshing = false;
                         for (TupleFolderEx folder : folders)
-                            if (folder.sync_state != null && (folder.account == null || "connected".equals(folder.accountState))) {
+                            if (folder.sync_state != null &&
+                                    (folder.account == null || "connected".equals(folder.accountState))) {
                                 refreshing = true;
                                 break;
                             }
@@ -1786,8 +1787,8 @@ public class FragmentMessages extends FragmentBase {
                             }
                         }
 
-                        boolean refreshing = (folder != null && folder.sync_state != null);
-
+                        boolean refreshing = (folder != null && folder.sync_state != null &&
+                                (folder.account == null || "connected".equals(folder.accountState)));
                         if (!refreshing && manual) {
                             manual = false;
                             rvMessage.scrollToPosition(0);