diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index 125fc52f07..4d9ac4b14a 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -639,7 +639,7 @@ public class EntityRule {
             create = create.replace("$domain$", domain == null ? "" : domain);
 
             String name = folder.name + (folder.separator == null ? "" : folder.separator) + create;
-            EntityFolder created = db.folder().getFolderByName(message.account, name);
+            EntityFolder created = db.folder().getFolderByName(folder.account, name);
             if (created == null) {
                 created = new EntityFolder();
                 created.tbc = true;