diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3cb3520e1f..f00dda89b9 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -36,7 +36,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.ColorStateList;
-import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -1319,8 +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()
-                    .isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_NORMAL);
+            boolean normal = (context.getResources().getConfiguration().screenWidthDp >= 360);
 
             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 f55d799c7a..039a683e3e 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -47,6 +47,7 @@
         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" />
@@ -137,25 +138,11 @@
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_undo"
+        android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
         app:layout_constraintTop_toBottomOf="@id/vSeparator"
         app:srcCompat="@drawable/baseline_undo_24" />
 
-    <ImageButton
-        android:id="@+id/ibUnsubscribe"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_marginEnd="9dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/title_legend_show_unsubscribe"
-        android:foregroundTint="?android:attr/textColorSecondary"
-        android:padding="6dp"
-        android:scaleType="fitCenter"
-        android:tooltipText="@string/title_legend_show_unsubscribe"
-        app:layout_constraintEnd_toStartOf="@+id/ibImages"
-        app:layout_constraintTop_toBottomOf="@id/vSeparator"
-        app:srcCompat="@drawable/baseline_unsubscribe_24" />
-
     <ImageButton
         android:id="@+id/ibImages"
         android:layout_width="36dp"
@@ -204,16 +191,31 @@
         android:id="@+id/ibDecrypt"
         android:layout_width="36dp"
         android:layout_height="36dp"
+        android:layout_marginEnd="9dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_decrypt"
         android:foregroundTint="?android:attr/textColorSecondary"
         android:padding="6dp"
         android:scaleType="fitCenter"
         android:tooltipText="@string/title_decrypt"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
         app:layout_constraintTop_toBottomOf="@id/ibFull"
         app:srcCompat="@drawable/baseline_lock_open_24" />
 
+    <ImageButton
+        android:id="@+id/ibUnsubscribe"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/title_legend_show_unsubscribe"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="6dp"
+        android:scaleType="fitCenter"
+        android:tooltipText="@string/title_legend_show_unsubscribe"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/ibFull"
+        app:srcCompat="@drawable/baseline_unsubscribe_24" />
+
     <eu.faircode.email.FixedTextView
         android:id="@+id/tvSignedData"
         android:layout_width="0dp"