diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index bd8074067c..c8306186c3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3980,6 +3980,8 @@ public class FragmentMessages extends FragmentBase
                         EntityFolder targetFolder = db.folder().getFolder(tid);
                         if (targetFolder == null)
                             throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
+                        if (targetFolder.account == null)
+                            return result;
 
                         EntityAccount targetAccount = db.account().getAccount(targetFolder.account);
                         if (targetAccount == null)