diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 275e3c70d8..01da7cdd7c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -560,9 +560,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                             draft.getAvatar(context);
                             draft.id = db.message().insertMessage(draft);
                             draft.write(context, body);
-                        }
 
-                        EntityOperation.queue(db, draft, EntityOperation.ADD);
+                            EntityOperation.queue(db, draft, EntityOperation.ADD);
+                        }
 
                         db.setTransactionSuccessful();
                     } finally {
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 41cc72130c..f520229024 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -215,16 +215,16 @@ public class Helper {
                                             draft.getAvatar(context);
                                             draft.id = db.message().insertMessage(draft);
                                             draft.write(context, body);
-                                        }
 
-                                        EntityOperation.queue(db, draft, EntityOperation.ADD);
+                                            EntityOperation.queue(db, draft, EntityOperation.ADD);
+                                        }
 
                                         db.setTransactionSuccessful();
                                     } finally {
                                         db.endTransaction();
                                     }
 
-                                    return draft.id;
+                                    return (draft == null ? null : draft.id);
                                 }
 
                                 @Override