diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index df183f94df..151e1c0dd8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -960,14 +960,14 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             vSeparatorBody.setVisibility(View.VISIBLE);
 
-            ibFull.setVisibility(hasWebView ? View.INVISIBLE : View.GONE);
-            ibImages.setVisibility(View.INVISIBLE);
+            ibFull.setVisibility(View.GONE);
+            ibImages.setVisibility(View.GONE);
 
-            ibReply.setVisibility(View.INVISIBLE);
-            ibArchive.setVisibility(View.INVISIBLE);
-            ibMove.setVisibility(View.INVISIBLE);
-            ibDelete.setVisibility(View.INVISIBLE);
-            ibMove.setVisibility(View.INVISIBLE);
+            ibReply.setVisibility(View.GONE);
+            ibArchive.setVisibility(View.GONE);
+            ibMove.setVisibility(View.GONE);
+            ibDelete.setVisibility(View.GONE);
+            ibMove.setVisibility(View.GONE);
 
             if (textSize != 0)
                 tvBody.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
@@ -1215,11 +1215,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             cbInline.setOnCheckedChangeListener(null);
             cbInline.setChecked(show_inline);
             cbInline.setVisibility(has_inline ? View.VISIBLE : View.GONE);
-            ibDecrypt.setVisibility(is_encrypted ? View.VISIBLE : View.GONE);
+
             btnDownloadAttachments.setVisibility(download && suitable ? View.VISIBLE : View.GONE);
             btnSaveAttachments.setVisibility(save ? View.VISIBLE : View.GONE);
             tvNoInternetAttachments.setVisibility(downloading && !suitable ? View.VISIBLE : View.GONE);
 
+            ibDecrypt.setVisibility(is_encrypted ? View.VISIBLE : View.GONE);
+
             cbInline.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 @Override
                 public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index e34f125ff3..a59d16a118 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -195,13 +195,13 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:layout_marginTop="3dp"
-        android:layout_marginEnd="6dp"
+        android:layout_marginEnd="42dp"
         android:fontFamily="monospace"
         android:minHeight="396dp"
         android:paddingBottom="6dp"
         android:text="Body"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        app:layout_constraintEnd_toStartOf="@id/ibReply"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvNoInternetBody" />