diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 9eda9ee1c7..e0a7685e6f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3423,6 +3423,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     // Insert into drafts
                     EntityFolder drafts = db.folder().getFolderByType(message.account, EntityFolder.DRAFTS);
+                    if (drafts == null)
+                        return null;
+
                     message.id = null;
                     message.folder = drafts.id;
                     message.fts = false;