diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8e2306c0e5..90e9e7363c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3050,6 +3050,15 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             }
         });
 
+        loadMessages(false);
+
+        updateExpanded();
+
+        if (selectionTracker != null && selectionTracker.hasSelection())
+            fabMore.show();
+        else
+            fabMore.hide();
+
         // Folder
         switch (viewType) {
             case UNIFIED:
@@ -3131,15 +3140,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 break;
         }
 
-        loadMessages(false);
-
-        updateExpanded();
-
-        if (selectionTracker != null && selectionTracker.hasSelection())
-            fabMore.show();
-        else
-            fabMore.hide();
-
         if (!checkReporting())
             if (!checkReview())
                 checkFingerprint();