diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 83e2e004f0..44efd4b483 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3839,7 +3839,8 @@ public class FragmentCompose extends FragmentBase {
 
                             // Limit number of nested block quotes
                             boolean quote_limit = prefs.getBoolean("quote_limit", true);
-                            if (quote_limit)
+                            if (quote_limit &&
+                                    ("reply".equals(action) || "reply_all".equals(action)))
                                 for (Element bq : e.select("blockquote")) {
                                     int level = 1;
                                     Element parent = bq.parent();