diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e53265f1f5..dbaa3ac26f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -172,7 +172,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private BottomNavigationView bnvActions;
 
-        private View vSeparatorBody;
         private Button btnHtml;
         private Button btnImages;
         private TextView tvBody;
@@ -234,7 +233,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             bnvActions = itemView.findViewById(R.id.bnvActions);
 
-            vSeparatorBody = itemView.findViewById(R.id.vSeparatorBody);
             btnHtml = itemView.findViewById(R.id.btnHtml);
             btnImages = itemView.findViewById(R.id.btnImages);
             tvBody = itemView.findViewById(R.id.tvBody);
@@ -293,7 +291,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             pbHeaders.setVisibility(View.GONE);
             bnvActions.setVisibility(View.GONE);
-            vSeparatorBody.setVisibility(View.GONE);
             btnHtml.setVisibility(View.GONE);
             btnImages.setVisibility(View.GONE);
             pbBody.setVisibility(View.GONE);
@@ -445,18 +442,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvSize.setTextColor(colorUnseen);
             tvTime.setTextColor(colorUnseen);
 
+            grpExpanded.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.VISIBLE : View.GONE);
             grpAddress.setVisibility(viewType == ViewType.THREAD && show_expanded && show_addresses ? View.VISIBLE : View.GONE);
             tvKeywords.setVisibility(View.GONE);
             ivAddContact.setVisibility(viewType == ViewType.THREAD && show_expanded && show_addresses && contacts && message.from != null ? View.VISIBLE : View.GONE);
             pbHeaders.setVisibility(View.GONE);
             grpHeaders.setVisibility(show_headers && show_expanded ? View.VISIBLE : View.GONE);
-            bnvActions.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
-            vSeparatorBody.setVisibility(View.GONE);
-            btnHtml.setVisibility(View.GONE);
-            btnImages.setVisibility(View.GONE);
-            pbBody.setVisibility(View.GONE);
             grpAttachments.setVisibility(message.attachments > 0 && show_expanded ? View.VISIBLE : View.GONE);
-            grpExpanded.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.VISIBLE : View.GONE);
+            bnvActions.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
+            btnHtml.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
+            btnImages.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
+            pbBody.setVisibility(View.GONE);
 
             bnvActions.setTag(null);
 
@@ -482,7 +478,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 tvHeaders.setText(show_headers ? message.headers : null);
 
-                vSeparatorBody.setVisibility(View.VISIBLE);
+                for (int i = 0; i < bnvActions.getMenu().size(); i++)
+                    bnvActions.getMenu().getItem(i).setVisible(false);
+                bnvActions.setVisibility(View.VISIBLE);
+
                 tvBody.setText(null);
 
                 TypedArray ta;
@@ -570,9 +569,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         bnvActions.getMenu().findItem(R.id.action_archive).setVisible(message.uid != null && !inArchive && hasArchive);
                         bnvActions.getMenu().findItem(R.id.action_reply).setEnabled(message.content);
                         bnvActions.getMenu().findItem(R.id.action_reply).setVisible(!inOutbox);
-
-                        bnvActions.setVisibility(View.VISIBLE);
-                        vSeparatorBody.setVisibility(View.GONE);
                     }
 
                     @Override
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 54217023b2..0e9af06d92 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -559,16 +559,6 @@
             app:layout_constraintTop_toBottomOf="@id/rvAttachment"
             app:menu="@menu/action_message" />
 
-        <View
-            android:id="@+id/vSeparatorBody"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
         <Button
             android:id="@+id/btnHtml"
             style="?android:attr/buttonStyleSmall"
@@ -580,7 +570,7 @@
             android:minHeight="0dp"
             android:text="@string/title_show_html"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
+            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
 
         <Button
             android:id="@+id/btnImages"
@@ -593,7 +583,7 @@
             android:minHeight="0dp"
             android:text="@string/title_show_images"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
+            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier_body"
@@ -609,9 +599,9 @@
             android:layout_marginStart="6dp"
             android:layout_marginTop="3dp"
             android:layout_marginEnd="6dp"
-            android:paddingBottom="6dp"
             android:fontFamily="monospace"
             android:minHeight="60dp"
+            android:paddingBottom="6dp"
             android:text="Body"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 164c2be7d3..4c4c10ceb7 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -563,16 +563,6 @@
             app:layout_constraintTop_toBottomOf="@id/rvAttachment"
             app:menu="@menu/action_message" />
 
-        <View
-            android:id="@+id/vSeparatorBody"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="3dp"
-            android:background="?attr/colorSeparator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
-
         <Button
             android:id="@+id/btnHtml"
             style="?android:attr/buttonStyleSmall"
@@ -584,7 +574,7 @@
             android:minHeight="0dp"
             android:text="@string/title_show_html"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
+            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
 
         <Button
             android:id="@+id/btnImages"
@@ -597,7 +587,7 @@
             android:minHeight="0dp"
             android:text="@string/title_show_images"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vSeparatorBody" />
+            app:layout_constraintTop_toBottomOf="@id/bnvActions" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier_body"
@@ -613,9 +603,9 @@
             android:layout_marginStart="6dp"
             android:layout_marginTop="3dp"
             android:layout_marginEnd="6dp"
-            android:paddingBottom="6dp"
             android:fontFamily="monospace"
             android:minHeight="60dp"
+            android:paddingBottom="6dp"
             android:text="Body"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textIsSelectable="true"