diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8c8036dd..dcf85b6b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -712,11 +712,10 @@ public class FragmentCompose extends FragmentEx {
                 draft.id = db.message().insertMessage(draft);
                 draft.write(context, body == null ? "" : body);
 
-                if (args.containsKey("attachments")) {
-                    ArrayList<Uri> uris = args.getParcelableArrayList("attachments");
+                ArrayList<Uri> uris = args.getParcelableArrayList("attachments");
+                if (uris != null)
                     for (Uri uri : uris)
                         addAttachment(context, draft.id, uri);
-                }
 
                 EntityOperation.queue(db, draft, EntityOperation.ADD);