diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 55385b1bbd..bd4bd90d71 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2392,6 +2392,16 @@ public class HtmlHelper {
             }
         }
 
+        for (Element quote : doc.select("blockquote")) {
+            Element prev = quote.previousElementSibling();
+            if (prev != null && "br".equals(prev.tagName()))
+                prev.remove();
+
+            Element last = quote.children().last();
+            if (last != null && "br".equals(last.tagName()))
+                last.remove();
+        }
+
         return doc.html();
     }