diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e14600a447..9a64bd759d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -180,6 +180,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private boolean contrast;
     private boolean monospaced;
     private boolean autoimages;
+    private boolean collapse_quotes;
     private boolean authentication;
     private static boolean debug;
 
@@ -1922,7 +1923,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void loadText(TupleMessageEx message) {
             if (message.content) {
                 boolean show_images = properties.getValue("images", message.id);
-                boolean show_quotes = properties.getValue("quotes", message.id);
+                boolean show_quotes = (properties.getValue("quotes", message.id) || !collapse_quotes);
 
                 Bundle args = new Bundle();
                 args.putSerializable("message", message);
@@ -2032,7 +2033,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 boolean has_quotes = args.getBoolean("has_quotes");
                 boolean has_images = args.getBoolean("has_images");
-                boolean show_quotes = properties.getValue("quotes", message.id);
+                boolean show_quotes = (properties.getValue("quotes", message.id) || !collapse_quotes);
                 boolean show_images = properties.getValue("images", message.id);
 
                 ibFull.setVisibility(hasWebView ? View.VISIBLE : View.GONE);
@@ -2937,6 +2938,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.contrast = prefs.getBoolean("contrast", false);
         this.monospaced = prefs.getBoolean("monospaced", false);
         this.autoimages = (this.contacts && prefs.getBoolean("autoimages", false));
+        this.collapse_quotes = prefs.getBoolean("collapse_quotes", false);
         this.authentication = prefs.getBoolean("authentication", true);
         this.debug = prefs.getBoolean("debug", false);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 3ed159a033..0c1b82b14b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -54,16 +54,19 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
     private SwitchCompat swPreview;
     private SwitchCompat swAddresses;
     private SwitchCompat swAttachmentsAlt;
+
     private SwitchCompat swContrast;
     private SwitchCompat swMonospaced;
     private SwitchCompat swInline;
     private SwitchCompat swImages;
+    private SwitchCompat swCollapseQuotes;
     private SwitchCompat swRemoteContent;
     private SwitchCompat swActionbar;
 
     private final static String[] RESET_OPTIONS = new String[]{
             "theme", "startup", "date", "threading", "avatars", "identicons", "circular", "name_email", "subject_italic",
-            "flags", "preview", "addresses", "attachments_alt", "contrast", "monospaced", "inline_images", "autoimages", "autocontent", "actionbar",
+            "flags", "preview", "addresses", "attachments_alt",
+            "contrast", "monospaced", "inline_images", "autoimages", "collapse_quotes", "autocontent", "actionbar",
     };
 
     @Override
@@ -93,6 +96,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swMonospaced = view.findViewById(R.id.swMonospaced);
         swInline = view.findViewById(R.id.swInline);
         swImages = view.findViewById(R.id.swImages);
+        swCollapseQuotes = view.findViewById(R.id.swCollapseQuotes);
         swRemoteContent = view.findViewById(R.id.swRemoteContent);
         swActionbar = view.findViewById(R.id.swActionbar);
 
@@ -230,6 +234,13 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             }
         });
 
+        swCollapseQuotes.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("collapse_quotes", checked).apply();
+            }
+        });
+
         swRemoteContent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -313,6 +324,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swMonospaced.setChecked(prefs.getBoolean("monospaced", false));
         swInline.setChecked(prefs.getBoolean("inline_images", false));
         swImages.setChecked(prefs.getBoolean("autoimages", false));
+        swCollapseQuotes.setChecked(prefs.getBoolean("collapse_quotes", false));
         swRemoteContent.setChecked(prefs.getBoolean("autocontent", false));
         swActionbar.setChecked(prefs.getBoolean("actionbar", true));
     }
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index c192998bc3..905b795881 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -266,6 +266,16 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/swImages" />
 
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/swCollapseQuotes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:text="@string/title_advanced_collapse_quotes"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvImagesHint"
+                app:switchPadding="12dp" />
+
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swRemoteContent"
                 android:layout_width="match_parent"
@@ -273,7 +283,7 @@
                 android:layout_marginTop="12dp"
                 android:text="@string/title_advanced_remote_content"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvImagesHint"
+                app:layout_constraintTop_toBottomOf="@id/swCollapseQuotes"
                 app:switchPadding="12dp" />
 
             <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b826025626..72d01dfa94 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -211,6 +211,7 @@
     <string name="title_advanced_monospaced">Use monospaced font for message text</string>
     <string name="title_advanced_images_inline">Automatically show inline images</string>
     <string name="title_advanced_images">Automatically show images for known contacts</string>
+    <string name="title_advanced_collapse_quotes">Collapse quoted text</string>
     <string name="title_advanced_remote_content">Automatically show remote content when viewing original messages</string>
     <string name="title_advanced_actionbar">Conversation action bar</string>