diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index e8929d1c5d..7a3e170561 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -1182,6 +1182,8 @@ public class Log {
 
             EntityIdentity identity = identities.get(0);
             EntityFolder drafts = db.folder().getFolderByType(identity.account, EntityFolder.DRAFTS);
+            if (drafts == null)
+                throw new IllegalArgumentException(context.getString(R.string.title_no_drafts));
 
             draft = new EntityMessage();
             draft.account = drafts.account;