diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java
index ef1a75a5ec..f0215bca8d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolders.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java
@@ -346,6 +346,7 @@ public class FragmentFolders extends FragmentBase {
     private void onSwipeRefresh() {
         Bundle args = new Bundle();
         args.putLong("account", account);
+        args.putBoolean("primary", primary);
 
         new SimpleTask<Void>() {
             @Override
@@ -356,6 +357,7 @@ public class FragmentFolders extends FragmentBase {
             @Override
             protected Void onExecute(Context context, Bundle args) {
                 long aid = args.getLong("account");
+                boolean primary = args.getBoolean("primary");
 
                 if (!ConnectionHelper.getNetworkState(context).isSuitable())
                     throw new IllegalStateException(context.getString(R.string.title_no_internet));
@@ -372,6 +374,12 @@ public class FragmentFolders extends FragmentBase {
                 try {
                     db.beginTransaction();
 
+                    if (primary) {
+                        EntityAccount account = db.account().getPrimaryAccount();
+                        if (account != null)
+                            aid = account.id;
+                    }
+
                     List<EntityFolder> folders;
                     if (aid < 0)
                         folders = db.folder().getFoldersUnified(null, true);