diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index acf440d535..056d6fa817 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -109,6 +109,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             ivDelete.setVisibility(readonly ? View.GONE : attachment.isInline() ? View.INVISIBLE : View.VISIBLE);
             tvName.setText(attachment.name);
             tvType.setText(attachment.type);
+            tvType.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
 
             if (attachment.size != null)
                 tvSize.setText(Helper.humanReadableByteCount(attachment.size, true));
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d6e0f080e1..12d1a21cd1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -899,7 +899,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             boolean downloading = false;
             List<EntityAttachment> a = new ArrayList<>();
             for (EntityAttachment attachment : attachments) {
-                if (attachment.isInline())
+                if (attachment.isInline() || TextUtils.isEmpty(attachment.name))
                     inline = true;
                 if (attachment.progress == null && !attachment.available)
                     download = true;
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index e274b5b425..e96dbdd05a 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -8,8 +8,9 @@
 
     <ImageView
         android:id="@+id/ivDelete"
-        android:layout_width="24dp"
+        android:layout_width="36dp"
         android:layout_height="24dp"
+        android:paddingEnd="12dp"
         android:src="@drawable/baseline_delete_24"
         android:visibility="visible"
         app:layout_constraintStart_toStartOf="parent"
@@ -78,9 +79,9 @@
 
     <ImageView
         android:id="@+id/ivSave"
-        android:layout_width="24dp"
+        android:layout_width="36dp"
         android:layout_height="24dp"
-        android:layout_marginStart="6dp"
+        android:paddingStart="12dp"
         android:src="@drawable/baseline_save_24"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/ivStatus"