diff --git a/app/src/main/java/eu/faircode/email/ActivityCompose.java b/app/src/main/java/eu/faircode/email/ActivityCompose.java
index 16858dd53c..9a0eb65a58 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCompose.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCompose.java
@@ -274,6 +274,7 @@ public class ActivityCompose extends ActivityBase implements FragmentManager.OnB
         boolean attach_new = prefs.getBoolean("attach_new", true);
 
         if (!attach_new && !create &&
+                args != null &&
                 args.size() == 1 &&
                 (args.containsKey("to") ||
                         args.containsKey("attachments"))) {