diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index acb753b2c1..debb2b18c2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -67,10 +67,10 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
         private View view;
         private ImageButton ibDelete;
         private TextView tvName;
-        private TextView tvType;
         private TextView tvSize;
         private ImageView ivStatus;
         private ImageButton ibSave;
+        private TextView tvType;
         private TextView tvDebug;
         private ProgressBar progressbar;
 
@@ -80,10 +80,10 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             view = itemView.findViewById(R.id.clItem);
             ibDelete = itemView.findViewById(R.id.ibDelete);
             tvName = itemView.findViewById(R.id.tvName);
-            tvType = itemView.findViewById(R.id.tvType);
             tvSize = itemView.findViewById(R.id.tvSize);
             ivStatus = itemView.findViewById(R.id.ivStatus);
             ibSave = itemView.findViewById(R.id.ibSave);
+            tvType = itemView.findViewById(R.id.tvType);
             tvDebug = itemView.findViewById(R.id.tvDebug);
             progressbar = itemView.findViewById(R.id.progressbar);
         }
@@ -105,8 +105,6 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
 
             ibDelete.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));
@@ -130,14 +128,11 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             progressbar.setVisibility(
                     attachment.progress == null || attachment.available ? View.GONE : View.VISIBLE);
 
-            if (debug)
-                tvDebug.setText(attachment.error +
-                        "\n" + attachment.type +
-                        " " + attachment.disposition +
-                        " " + attachment.cid + " " + attachment.encryption);
-            else if (attachment.error != null)
-                tvDebug.setText(attachment.error);
-            tvDebug.setVisibility(debug || attachment.error != null ? View.VISIBLE : View.GONE);
+            tvType.setText(attachment.type + " " + attachment.disposition + " " + attachment.cid + "/" + attachment.encryption);
+            tvType.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
+
+            tvDebug.setText(attachment.error);
+            tvDebug.setVisibility(attachment.error == null ? View.GONE : View.VISIBLE);
         }
 
         @Override
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
index ee24c8179a..8e45e113dd 100644
--- a/app/src/main/res/layout/item_attachment.xml
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -44,27 +44,11 @@
             android:text="Name"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
-            app:layout_constraintEnd_toStartOf="@+id/tvType"
+            app:layout_constraintEnd_toStartOf="@+id/tvSize"
             app:layout_constraintHorizontal_weight="4"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
             app:layout_constraintTop_toTopOf="@id/ivAttachments" />
 
-        <TextView
-            android:id="@+id/tvType"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:ellipsize="start"
-            android:gravity="end"
-            android:singleLine="true"
-            android:text="text/plain"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
-            app:layout_constraintEnd_toStartOf="@id/tvSize"
-            app:layout_constraintHorizontal_weight="1"
-            app:layout_constraintStart_toEndOf="@id/tvName"
-            app:layout_constraintTop_toTopOf="@id/ivAttachments" />
-
         <TextView
             android:id="@+id/tvSize"
             android:layout_width="wrap_content"
@@ -74,7 +58,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@id/ivAttachments"
             app:layout_constraintEnd_toStartOf="@+id/ivStatus"
-            app:layout_constraintStart_toEndOf="@id/tvType"
+            app:layout_constraintStart_toEndOf="@id/tvName"
             app:layout_constraintTop_toTopOf="@id/ivAttachments" />
 
         <ImageView
@@ -100,6 +84,19 @@
             app:layout_constraintStart_toEndOf="@id/ivStatus"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/tvType"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="start"
+            android:singleLine="true"
+            android:text="text/plain"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintEnd_toEndOf="@id/ivStatus"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toStartOf="@id/tvName"
+            app:layout_constraintTop_toBottomOf="@id/ivAttachments" />
+
         <TextView
             android:id="@+id/tvDebug"
             android:layout_width="0dp"
@@ -110,7 +107,7 @@
             android:textColor="?attr/colorWarning"
             app:layout_constraintEnd_toEndOf="@id/ivStatus"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
-            app:layout_constraintTop_toBottomOf="@id/ivAttachments" />
+            app:layout_constraintTop_toBottomOf="@id/tvType" />
 
         <ProgressBar
             android:id="@+id/progressbar"