diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 0e0db13f93..041f37e359 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -395,6 +395,7 @@ public class FragmentMessages extends FragmentEx {
             selectionTracker.addObserver(new SelectionTracker.SelectionObserver() {
                 @Override
                 public void onSelectionChanged() {
+                    swipeRefresh.setEnabled(false);
                     if (selectionTracker.hasSelection()) {
                         if (messages != null) {
                             messages.removeObservers(getViewLifecycleOwner());
@@ -402,9 +403,10 @@ public class FragmentMessages extends FragmentEx {
                         }
                         fabMore.show();
                     } else {
-                        fabMore.hide();
                         predicate.clearAccount();
+                        fabMore.hide();
                         loadMessages();
+                        swipeRefresh.setEnabled(true);
                     }
                 }
             });