diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java b/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java
index 9fee1f1600..e7b9ce8a2e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentitySelect.java
@@ -30,11 +30,11 @@ public class AdapterIdentitySelect extends ArrayAdapter<TupleIdentityEx> {
     }
 
     @Override
-    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+    public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) {
         return getLayout(position, convertView, parent, R.layout.spinner_item2_dropdown);
     }
 
-    View getLayout(int position, View convertView, ViewGroup parent, int resid) {
+    private View getLayout(int position, View convertView, ViewGroup parent, int resid) {
         View view = LayoutInflater.from(context).inflate(resid, parent, false);
 
         TupleIdentityEx identity = identities.get(position);
@@ -44,8 +44,8 @@ public class AdapterIdentitySelect extends ArrayAdapter<TupleIdentityEx> {
         TextView text2 = view.findViewById(android.R.id.text2);
 
         vwColor.setBackgroundColor(identity.color == null ? Color.TRANSPARENT : identity.color);
-        text1.setText(identity.accountName + "/" + identity.getDisplayName() + (identity.primary ? " ★" : ""));
-        text2.setText(identity.email);
+        text1.setText(identity.getDisplayName() + (identity.primary ? " ★" : ""));
+        text2.setText(identity.accountName + "/" + identity.email);
 
         return view;
     }