diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 44efd4b483..58a2d6e583 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3838,7 +3838,7 @@ public class FragmentCompose extends FragmentBase {
                             Element e = d.body();
 
                             // Limit number of nested block quotes
-                            boolean quote_limit = prefs.getBoolean("quote_limit", true);
+                            boolean quote_limit = prefs.getBoolean("quote_limit", false);
                             if (quote_limit &&
                                     ("reply".equals(action) || "reply_all".equals(action)))
                                 for (Element bq : e.select("blockquote")) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index ccef1b0738..2599e11429 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
@@ -411,7 +411,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         swSeparateReply.setChecked(prefs.getBoolean("separate_reply", false));
         swExtendedReply.setChecked(prefs.getBoolean("extended_reply", false));
         swQuoteReply.setChecked(prefs.getBoolean("quote_reply", true));
-        swQuoteLimit.setChecked(prefs.getBoolean("quote_limit", true));
+        swQuoteLimit.setChecked(prefs.getBoolean("quote_limit", false));
         swQuoteLimit.setEnabled(swQuoteReply.isChecked());
         swResizeReply.setChecked(prefs.getBoolean("resize_reply", true));