diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6419aec600..0e0db13f93 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -395,11 +395,16 @@ public class FragmentMessages extends FragmentEx {
             selectionTracker.addObserver(new SelectionTracker.SelectionObserver() {
                 @Override
                 public void onSelectionChanged() {
-                    if (selectionTracker.hasSelection())
+                    if (selectionTracker.hasSelection()) {
+                        if (messages != null) {
+                            messages.removeObservers(getViewLifecycleOwner());
+                            messages = null;
+                        }
                         fabMore.show();
-                    else {
+                    } else {
                         fabMore.hide();
                         predicate.clearAccount();
+                        loadMessages();
                     }
                 }
             });