diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index efc41de07d..c6e2fe492f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1318,7 +1318,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             boolean cross_hint = prefs.getBoolean("cross_hint", true);
-            boolean normal = (context.getResources().getConfiguration().screenWidthDp >= 400);
+            boolean normal = (context.getResources().getConfiguration().screenWidthDp >= 9 * 39 - 3);
 
             vSeparator.setVisibility(View.VISIBLE);
             ibFull.setEnabled(false);
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 53212d9ac5..8df8be8150 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -40,13 +40,14 @@
         android:id="@+id/ibRemove"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_delete"
         android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_delete"
+        android:visibility="gone"
         app:layout_constraintStart_toEndOf="@id/ibMore"
         app:layout_constraintTop_toBottomOf="@id/vSeparator"
         app:srcCompat="@drawable/baseline_close_24" />
@@ -55,7 +56,7 @@
         android:id="@+id/ibJunk"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_spam"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -70,7 +71,7 @@
         android:id="@+id/ibTrash"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_delete"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -85,7 +86,7 @@
         android:id="@+id/ibArchive"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_archive"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -100,7 +101,7 @@
         android:id="@+id/ibMove"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_move"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -115,7 +116,7 @@
         android:id="@+id/ibAnswer"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_reply"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -130,7 +131,7 @@
         android:id="@+id/ibUnsubscribe"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="9dp"
+        android:layout_marginStart="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_unsubscribe"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -145,13 +146,14 @@
         android:id="@+id/ibUndo"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginEnd="9dp"
+        android:layout_marginEnd="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_undo"
         android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_undo"
+        android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@+id/ibImages"
         app:layout_constraintTop_toBottomOf="@id/vSeparator"
         app:srcCompat="@drawable/baseline_undo_24" />
@@ -160,7 +162,7 @@
         android:id="@+id/ibImages"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginEnd="9dp"
+        android:layout_marginEnd="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_show_images"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -189,7 +191,7 @@
         android:id="@+id/ibVerify"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginEnd="9dp"
+        android:layout_marginEnd="3dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_sign"
         android:foregroundTint="?android:attr/textColorSecondary"
@@ -229,7 +231,7 @@
         android:id="@+id/tvCrossHint"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
+        android:layout_marginStart="3dp"
         android:text="@string/title_message_bar_hint"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="italic"