diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index fc74e510bd..1d554beae2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -1354,6 +1354,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     lbm.sendBroadcast(
                             new Intent(ActivityView.ACTION_EDIT_FOLDER)
                                     .putExtra("id", folder.id)
+                                    .putExtra("account", folder.account)
                                     .putExtra("imap", folder.accountProtocol == EntityAccount.TYPE_IMAP));
                 }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index e9d8005496..6fd9a87fef 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -6937,6 +6937,7 @@ public class FragmentMessages extends FragmentBase
                 lbm.sendBroadcast(
                         new Intent(ActivityView.ACTION_EDIT_FOLDER)
                                 .putExtra("id", folder.id)
+                                .putExtra("account", folder.account)
                                 .putExtra("imap", args.getBoolean("imap")));
             }