diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7cdb41fe0e..16eeb843c8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -804,19 +804,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (tvSubject != null) {
                 tvSubject.setTextColor(colorSubject);
 
-                if (compact) {
-                    boolean full = "full".equals(subject_ellipsize);
-                    tvSubject.setSingleLine(!full);
-
-                    if ("start".equals(subject_ellipsize))
-                        tvSubject.setEllipsize(TextUtils.TruncateAt.START);
-                    else if ("end".equals(subject_ellipsize))
-                        tvSubject.setEllipsize(TextUtils.TruncateAt.END);
-                    else if ("middle".equals(subject_ellipsize))
-                        tvSubject.setEllipsize(TextUtils.TruncateAt.MIDDLE);
-                    else
-                        tvSubject.setEllipsize(null);
-                }
+                boolean full = "full".equals(subject_ellipsize);
+                tvSubject.setSingleLine(!full);
+
+                if ("start".equals(subject_ellipsize))
+                    tvSubject.setEllipsize(TextUtils.TruncateAt.START);
+                else if ("end".equals(subject_ellipsize))
+                    tvSubject.setEllipsize(TextUtils.TruncateAt.END);
+                else if ("middle".equals(subject_ellipsize))
+                    tvSubject.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+                else
+                    tvSubject.setEllipsize(null);
             }
 
             if (tvKeywords != null) {
@@ -9215,8 +9213,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     }
 
     void setCompact(boolean compact) {
-        if (this.compact != compact) {
+        String sender_ellipsize = prefs.getString("sender_ellipsize", compact ? "end" : "full");
+        String subject_ellipsize = prefs.getString("subject_ellipsize", "full");
+
+        if (this.compact != compact ||
+                !Objects.equals(this.sender_ellipsize, sender_ellipsize) ||
+                !Objects.equals(this.subject_ellipsize, subject_ellipsize)) {
             this.compact = compact;
+            this.sender_ellipsize = sender_ellipsize;
+            this.subject_ellipsize = subject_ellipsize;
             properties.refresh();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 01b983013c..1692ea6e88 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -1129,8 +1129,10 @@ public class ApplicationEx extends Application
 
         if (version < 2317 && "a".equals(BuildConfig.REVISION)) {
             boolean compact = prefs.getBoolean("compact", false);
-            if (!compact)
+            if (!compact) {
                 editor.remove("sender_ellipsize");
+                editor.remove("subject_ellipsize");
+            }
         }
 
         if (version < BuildConfig.VERSION_CODE)
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index daa625f518..bfb2fb3f59 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7103,7 +7103,8 @@ public class FragmentMessages extends FragmentBase
         boolean compact = !prefs.getBoolean("compact", false);
         prefs.edit()
                 .putBoolean("compact", compact)
-                .remove("sender_ellipsize")
+                .putString("sender_ellipsize", compact ? "end" : "full")
+                .putString("subject_ellipsize", "full")
                 .apply();
 
         int zoom = (compact ? 0 : 1);
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 7160941ad5..0b8f5378d5 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1624,19 +1624,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSubjectEllipsize" />
 
-                <TextView
-                    android:id="@+id/tvSubjectEllipsizeRemark"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginEnd="48dp"
-                    android:text="@string/title_advanced_compact_mode_remark"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textStyle="italic"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/spSubjectEllipsize" />
-
                 <View
                     android:id="@+id/vSeparatorOther"
                     android:layout_width="0dp"
@@ -1645,7 +1632,7 @@
                     android:background="?attr/colorSeparator"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvSubjectEllipsizeRemark" />
+                    app:layout_constraintTop_toBottomOf="@id/spSubjectEllipsize" />
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swKeywords"