diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 90422d0d3f..627d849aaa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3083,9 +3083,12 @@ public class FragmentCompose extends FragmentBase {
                                     }
                                 }
 
-                                String plain = HtmlHelper.getText(body);
+                                Document d = JsoupEx.parse(body);
+                                d.select("div[fairemail=signature]").remove();
+                                d.select("div[fairemail=reference]").remove();
+                                String text = d.text();
                                 for (String keyword : keywords)
-                                    if (plain.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) {
+                                    if (text.matches("(?si).*\\b" + Pattern.quote(keyword.trim()) + "\\b.*")) {
                                         args.putBoolean("remind_attachment", true);
                                         break;
                                     }