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