diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 16af2880d2..c88035f2b2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2336,7 +2336,7 @@ public class FragmentCompose extends FragmentBase {
                 DB db = DB.getInstance(context);
 
                 EntityMessage draft = db.message().getMessage(id);
-                if (!draft.content)
+                if (draft == null || !draft.content)
                     return null;
 
                 List<EntityAttachment> attachments = db.attachment().getAttachments(id);