diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 33fb0ef643..bdc38b7186 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -440,7 +440,8 @@ public class ServiceSend extends ServiceBase {
 
             MessageHelper.MessageParts parts = helper.getMessageParts();
             String body = parts.getHtml(this);
-            if (parts.isPlainOnly())
+            Boolean plain = parts.isPlainOnly();
+            if (plain != null && plain)
                 body = body.replace("<div x-plain=\"true\">", "<div>");
 
             try {