diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index d990c308d5..a1851aa585 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2573,7 +2573,8 @@ public class FragmentMessages extends FragmentBase {
             if (boundaryCallback == null)
                 boundaryCallback = new BoundaryCallbackMessages(
                         getContext(), getViewLifecycleOwner(),
-                        folder, server, query, REMOTE_PAGE_SIZE,
+                        folder, server || viewType == AdapterMessage.ViewType.FOLDER,
+                        query, REMOTE_PAGE_SIZE,
                         new BoundaryCallbackMessages.IBoundaryCallbackMessages() {
                             @Override
                             public void onLoading() {