diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 86c5371dbd..5fb6e1f1ba 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2736,6 +2736,9 @@ public class HtmlHelper {
     }
 
     static void removeSignatures(Document d) {
+        // <div class="fairemail_signature">
+        d.body().select(".fairemail_signature").remove();
+
         // <div data-smartmail="gmail_signature">
         // <div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature">
         d.body().select("[data-smartmail=gmail_signature]").remove();
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 589d1c87d0..e8b24ddb21 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1043,8 +1043,11 @@ public class MessageHelper {
                     document.body().prependChild(div);
                 }
 
-                document.select("div[fairemail=signature]").removeAttr("fairemail");
-                document.select("div[fairemail=reference]").removeAttr("fairemail");
+                document.select("div[fairemail=signature]")
+                        .removeAttr("fairemail")
+                        .addClass("fairemail_signature");
+                document.select("div[fairemail=reference]")
+                        .removeAttr("fairemail");
 
                 Elements reply = document.select("div[fairemail=reply]");
                 if (message.isPlainOnly())