From 98fcae971befee5107b50288de8ace13709eafec Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 16 Jan 2021 19:49:50 +0100
Subject: [PATCH] Remove successive block quotes

---
 .../main/java/eu/faircode/email/AdapterMessage.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index c06ec3fb64..13b5446ae5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2216,8 +2216,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                         // Collapse quotes
                         if (!show_quotes) {
-                            for (Element quote : document.select("blockquote"))
-                                quote.html("&#8230;");
+                            List<Element> succesive = new ArrayList<>();
+                            for (Element quote : document.select("blockquote")) {
+                                Element next = quote.nextElementSibling();
+                                if (next != null && "blockquote".equals(next.tagName()))
+                                    succesive.add(quote);
+                                else
+                                    quote.html("&#8230;");
+                            }
+                            for (Element quote : succesive)
+                                quote.remove();
                         }
 
                         // Draw images