diff --git a/app/build.gradle b/app/build.gradle
index cee2079d14..3cc555da4d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 def getVersionCode = { -> return 2316 }
-def getRevision = { -> return "a" }
+def getRevision = { -> return "b" }
 def getReleaseName = { -> return "Elopteryx" }
 // https://en.wikipedia.org/wiki/List_of_dinosaur_genera
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 995868aced..7cdb41fe0e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -788,19 +788,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 vwColor.getLayoutParams().width = colorStripeWidth;
 
             if (tvFrom != null) {
-                if (compact) {
-                    boolean full = "full".equals(sender_ellipsize);
-                    tvFrom.setSingleLine(!full);
-
-                    if ("start".equals(sender_ellipsize))
-                        tvFrom.setEllipsize(TextUtils.TruncateAt.START);
-                    else if ("end".equals(sender_ellipsize))
-                        tvFrom.setEllipsize(TextUtils.TruncateAt.END);
-                    else if ("middle".equals(sender_ellipsize))
-                        tvFrom.setEllipsize(TextUtils.TruncateAt.MIDDLE);
-                    else
-                        tvFrom.setEllipsize(null);
-                }
+                boolean full = "full".equals(sender_ellipsize);
+                tvFrom.setSingleLine(!full);
+
+                if ("start".equals(sender_ellipsize))
+                    tvFrom.setEllipsize(TextUtils.TruncateAt.START);
+                else if ("end".equals(sender_ellipsize))
+                    tvFrom.setEllipsize(TextUtils.TruncateAt.END);
+                else if ("middle".equals(sender_ellipsize))
+                    tvFrom.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+                else
+                    tvFrom.setEllipsize(null);
             }
 
             if (tvSubject != null) {
@@ -8548,7 +8546,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             font_size_subject = Helper.getTextSize(context, fz_subject);
 
         this.subject_italic = prefs.getBoolean("subject_italic", true);
-        this.sender_ellipsize = prefs.getString("sender_ellipsize", "end");
+        this.sender_ellipsize = prefs.getString("sender_ellipsize", compact ? "end" : "full");
         this.subject_ellipsize = prefs.getString("subject_ellipsize", "full");
         this.show_filtered = prefs.getBoolean("show_filtered", false);
         this.keywords_header = prefs.getBoolean("keywords_header", false);
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index 0ba0adfb45..01b983013c 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -1127,6 +1127,12 @@ public class ApplicationEx extends Application
                 editor.putInt("viewport_height", 0);
         }
 
+        if (version < 2317 && "a".equals(BuildConfig.REVISION)) {
+            boolean compact = prefs.getBoolean("compact", false);
+            if (!compact)
+                editor.remove("sender_ellipsize");
+        }
+
         if (version < BuildConfig.VERSION_CODE)
             editor.putInt("previous_version", version);
         editor.putInt("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 d73cbce532..daa625f518 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -7101,7 +7101,10 @@ public class FragmentMessages extends FragmentBase
     private void onMenuCompact() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         boolean compact = !prefs.getBoolean("compact", false);
-        prefs.edit().putBoolean("compact", compact).apply();
+        prefs.edit()
+                .putBoolean("compact", compact)
+                .remove("sender_ellipsize")
+                .apply();
 
         int zoom = (compact ? 0 : 1);
         int padding = (compact || !cards ? 0 : 1);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 374469adf0..a5173083bb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -1773,7 +1773,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                     break;
                 }
 
-            String sender_ellipsize = prefs.getString("sender_ellipsize", "end");
+            boolean compact = prefs.getBoolean("compact", false);
+            String sender_ellipsize = prefs.getString("sender_ellipsize", compact ? "end" : "full");
             for (int pos = 0; pos < ellipsizeValues.length; pos++)
                 if (ellipsizeValues[pos].equals(sender_ellipsize)) {
                     spSenderEllipsize.setSelection(pos);
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 6fec88382e..7160941ad5 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1525,19 +1525,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSenderEllipsize" />
 
-                <TextView
-                    android:id="@+id/tvSenderEllipsizeRemark"
-                    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/spSenderEllipsize" />
-
                 <View
                     android:id="@+id/vSeparatorSubject"
                     android:layout_width="0dp"
@@ -1546,7 +1533,7 @@
                     android:background="?attr/colorSeparator"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvSenderEllipsizeRemark" />
+                    app:layout_constraintTop_toBottomOf="@id/spSenderEllipsize" />
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swSubjectTop"