diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 82d2c1324b..4b98a3b21f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2333,7 +2333,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                         EntityFolder targetFolder = db.folder().getFolder(tid);
                         if (targetFolder == null)
-                            return result;
+                            throw new IllegalArgumentException(context.getString(R.string.title_no_folder));
 
                         EntityAccount targetAccount = db.account().getAccount(targetFolder.account);
                         if (targetAccount == null)