diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 2b619cc051..79855d1683 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2673,6 +2673,9 @@ public class FragmentCompose extends FragmentBase {
 
             @Override
             protected void onExecuted(Bundle args, String completion) {
+                if (completion == null)
+                    return;
+
                 Editable edit = etBody.getText();
                 int start = etBody.getSelectionStart();
                 int end = etBody.getSelectionEnd();