diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index bf5e092ba6..3e380af448 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -908,13 +908,13 @@ public class MessageHelper {
                 String[] lines = result.split("\\r?\\n");
                 for (String line : lines) {
                     int tlevel = 0;
-                    while (line.startsWith(">")) {
+                    while (line.trim().startsWith(">")) {
                         tlevel++;
                         if (tlevel > level)
                             sb.append("<blockquote>");
-                        line = line.substring(1);
-                        if (line.startsWith(" "))
+                        while (line.startsWith(" "))
                             line = line.substring(1);
+                        line = line.substring(1);
                     }
                     for (int i = 0; i < level - tlevel; i++)
                         sb.append("</blockquote>");