diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ce5c6c7e90..06da4d2001 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -105,6 +105,7 @@ import com.google.android.material.snackbar.Snackbar;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -1731,6 +1732,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     return null;
                 }
 
+                if (!show_quotes) {
+                    Document document = Jsoup.parse(body);
+                    for (Element quote : document.select("blockquote"))
+                        quote.html("&#8230;");
+                    body = document.html();
+                }
+
                 Spanned html = decodeHtml(context, message, body);
 
                 SpannableStringBuilder builder = new SpannableStringBuilder(html);