diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 27ebc0c59b..bec5f66bd9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -911,7 +911,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             if (tvPreview.getTag() == null || (int) tvPreview.getTag() != textColor) {
                 tvPreview.setTag(textColor);
                 tvPreview.setTextColor(textColor);
-                tvPreview.setMaxLines(preview_lines);
+                if (preview_lines == 1)
+                    tvPreview.setSingleLine(true);
+                else
+                    tvPreview.setMaxLines(preview_lines);
             }
             tvPreview.setTypeface(
                     monospaced ? Typeface.MONOSPACE : Typeface.DEFAULT,
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index 59faafe398..1e670f745c 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -316,7 +316,6 @@
         android:layout_marginEnd="6dp"
         android:ellipsize="end"
         android:fontFamily="monospace"
-        android:maxLines="2"
         android:text="Preview"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="italic"
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 89b0cdb458..42b3e3f95a 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -313,7 +313,6 @@
         android:layout_marginEnd="6dp"
         android:ellipsize="end"
         android:fontFamily="monospace"
-        android:maxLines="2"
         android:text="Preview"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="italic"