diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 34986b62d3..24e2f01de0 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -563,7 +563,8 @@ public class MessageHelper {
 
             if (send) {
                 for (Element child : document.body().children())
-                    if (TextUtils.isEmpty(child.attr("fairemail"))) {
+                    if (!TextUtils.isEmpty(child.text()) &&
+                            TextUtils.isEmpty(child.attr("fairemail"))) {
                         String style = HtmlHelper.mergeStyles(
                                 "font-family:" + compose_font, child.attr("style"));
                         child.attr("style", style);