diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8d83385c9a..283bc24e7d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -45,6 +45,7 @@ import android.widget.FilterQueryProvider;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
@@ -659,7 +660,7 @@ public class FragmentCompose extends FragmentEx {
                     });
 
                     // Show identities
-                    ArrayAdapter<EntityIdentity> adapter = new ArrayAdapter<>(getContext(), R.layout.spinner_item, identities);
+                    IdentityAdapter adapter = new IdentityAdapter(getContext(), identities);
                     adapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
                     spFrom.setAdapter(adapter);
 
@@ -874,4 +875,42 @@ public class FragmentCompose extends FragmentEx {
                 Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
         }
     };
+
+    public class IdentityAdapter extends ArrayAdapter<EntityIdentity> {
+        private Context context;
+        private List<EntityIdentity> identities;
+
+        public IdentityAdapter(@NonNull Context context, List<EntityIdentity> identities) {
+            super(context, 0, identities);
+            this.context = context;
+            this.identities = identities;
+        }
+
+        @NonNull
+        @Override
+        public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
+            return getLayout(position, convertView, parent);
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            return getLayout(position, convertView, parent);
+        }
+
+        public View getLayout(int position, View convertView, ViewGroup parent) {
+            View view = convertView;
+            if (view == convertView)
+                view = LayoutInflater.from(context).inflate(R.layout.spinner_item2, parent, false);
+
+            EntityIdentity identity = identities.get(position);
+
+            TextView name = view.findViewById(android.R.id.text1);
+            name.setText(identity.name);
+
+            TextView email = view.findViewById(android.R.id.text2);
+            email.setText(identity.email);
+
+            return view;
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index aa00793b15..de54ac9049 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -6,10 +6,11 @@
 
     <Spinner
         android:id="@+id/spFrom"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:layout_marginTop="6dp"
+        app:layout_constraintEnd_toStartOf="@+id/ivIdentityAdd"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -21,7 +22,7 @@
         android:layout_marginStart="6dp"
         android:src="@drawable/baseline_person_add_24"
         app:layout_constraintBottom_toBottomOf="@id/spFrom"
-        app:layout_constraintStart_toEndOf="@id/spFrom"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/spFrom" />
 
     <AutoCompleteTextView
diff --git a/app/src/main/res/layout/spinner_item2.xml b/app/src/main/res/layout/spinner_item2.xml
new file mode 100644
index 0000000000..7e24181ff8
--- /dev/null
+++ b/app/src/main/res/layout/spinner_item2.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart">
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@android:id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Email"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@android:id/text1" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file