diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 894c8b302b..c522ed6bce 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3824,7 +3824,7 @@ public class FragmentCompose extends FragmentBase {
                                         });
 
                                     // Limit number of nested block quotes
-                                    boolean quote_limit = prefs.getBoolean("quote_limit", false);
+                                    boolean quote_limit = prefs.getBoolean("quote_limit", true);
                                     if (quote_limit)
                                         for (Element bq : d.select("blockquote")) {
                                             int level = 1;
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index 2599e11429..ccef1b0738 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", false));
+        swQuoteLimit.setChecked(prefs.getBoolean("quote_limit", true));
         swQuoteLimit.setEnabled(swQuoteReply.isChecked());
         swResizeReply.setChecked(prefs.getBoolean("resize_reply", true));