diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index ea5a8bbaf8..f7aec43749 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -5990,8 +5990,9 @@ public class FragmentCompose extends FragmentBase {
                                 !("list".equals(action) && TextUtils.isEmpty(selected_text)) &&
                                 !"dsn".equals(action)) {
                             // Reply/forward
-                            Element reply = document.createElement("div");
-                            reply.attr("fairemail", "reference");
+                            Element reply = document.createElement("div")
+                                    .addClass("fairemail_quote")
+                                    .attr("fairemail", "reference");
 
                             // Build reply header
                             boolean separate_reply = prefs.getBoolean("separate_reply", false);
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index a93beef9f3..617b7a09bb 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2860,8 +2860,14 @@ public class HtmlHelper {
     }
 
     static void removeQuotes(Document d) {
+        Elements quotes = d.body().select(".fairemail_quote");
+        if (quotes.size() > 0) {
+            quotes.remove();
+            return;
+        }
+
         // Gmail
-        Elements quotes = d.body().select(".gmail_quote");
+        quotes = d.body().select(".gmail_quote");
         if (quotes.size() > 0) {
             quotes.remove();
             return;