diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java b/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java
index ef3b52dbc0..2f466c787c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java
@@ -68,7 +68,8 @@ public class AdapterIdentitySelect extends ArrayAdapter<TupleIdentityEx> {
         View vwColor = view.findViewById(R.id.vwColor);
         TextView text1 = view.findViewById(android.R.id.text1);
         TextView text2 = view.findViewById(android.R.id.text2);
-        TextView tvExtra = view.findViewById(R.id.tvExtra);
+        TextView tvExtra1 = view.findViewById(R.id.tvExtra1);
+        TextView tvExtra2 = view.findViewById(R.id.tvExtra2);
 
         vwColor.setBackgroundColor(identity.color == null ? Color.TRANSPARENT : identity.color);
         vwColor.setVisibility(hasColor ? View.VISIBLE : View.GONE);
@@ -82,13 +83,16 @@ public class AdapterIdentitySelect extends ArrayAdapter<TupleIdentityEx> {
             text2.setText(identity.accountName + ":" + identity.email);
         }
 
-        tvExtra.setText(
+        tvExtra1.setText(identity.max_size == null ? null : Helper.humanReadableByteCount(identity.max_size));
+        tvExtra1.setVisibility(identity.max_size == null || !BuildConfig.DEBUG ? View.GONE : View.VISIBLE);
+
+        tvExtra2.setText(
                 (identity.cc == null ? "" : "+CC") +
                         (identity.bcc == null ? "" : "+BCC") +
                         (identity.replyto != null && !identity.replyto.equals(identity.email) ? "<<" : ""));
 
         text2.setVisibility(single ? View.GONE : View.VISIBLE);
-        tvExtra.setVisibility(identity.cc == null && identity.bcc == null ? View.GONE : View.VISIBLE);
+        tvExtra2.setVisibility(identity.cc == null && identity.bcc == null ? View.GONE : View.VISIBLE);
 
         return view;
     }
diff --git a/app/src/main/res/layout/spinner_identity.xml b/app/src/main/res/layout/spinner_identity.xml
index 19882b9755..9541e77291 100644
--- a/app/src/main/res/layout/spinner_identity.xml
+++ b/app/src/main/res/layout/spinner_identity.xml
@@ -24,7 +24,7 @@
         android:singleLine="true"
         android:text="Text1"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/tvExtra1"
         app:layout_constraintStart_toEndOf="@id/vwColor"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -40,20 +40,33 @@
         android:text="Text2"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tvExtra"
+        app:layout_constraintEnd_toStartOf="@+id/tvExtra2"
         app:layout_constraintStart_toEndOf="@id/vwColor"
         app:layout_constraintTop_toBottomOf="@android:id/text1" />
 
     <TextView
-        android:id="@+id/tvExtra"
+        android:id="@+id/tvExtra1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:layout_marginEnd="6dp"
         android:layout_marginBottom="6dp"
-        android:text="Text2"
+        android:text="Extra1"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@android:id/text1"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@android:id/text1" />
+        app:layout_constraintTop_toTopOf="@android:id/text1" />
+
+    <TextView
+        android:id="@+id/tvExtra2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="6dp"
+        android:layout_marginBottom="6dp"
+        android:text="Extra2"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintBottom_toBottomOf="@android:id/text2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@android:id/text2" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file