diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7d0d2ab06f..f82138a4b3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -742,6 +742,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void clearExpanded() {
             cowner.stop();
 
+            if (compact) {
+                tvFrom.setSingleLine(true);
+                tvSubject.setSingleLine(true);
+            }
+
             grpAddresses.setVisibility(View.GONE);
             grpHeaders.setVisibility(View.GONE);
             grpCalendar.setVisibility(View.GONE);
@@ -824,6 +829,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean show_headers = properties.getValue("headers", message.id);
             boolean show_html = properties.getValue("html", message.id);
 
+            if (compact) {
+                tvFrom.setSingleLine(false);
+                tvSubject.setSingleLine(false);
+            }
+
             grpAddresses.setVisibility(View.VISIBLE);
 
             boolean hasFrom = (message.from != null && message.from.length > 0);
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 2023abcecf..a69da21af8 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -73,7 +73,7 @@
             android:layout_marginEnd="6dp"
             android:ellipsize="end"
             android:gravity="center_vertical"
-            android:maxLines="1"
+            android:singleLine="true"
             android:minHeight="24dp"
             android:text="From"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"