diff --git a/app/k9mail/src/main/res/drawable/dialog_background.xml b/app/k9mail/src/main/res/drawable/dialog_background.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f32a99f718b9d042aa584d6c49ea451c662cd08d
--- /dev/null
+++ b/app/k9mail/src/main/res/drawable/dialog_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022  E FOUNDATION
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/color_dialog_backgronund" />
+    <corners android:radius="4dp" />
+</shape>
\ No newline at end of file
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 5a61f2926049affa2f972f51a92039776273e125..543cf607561951a13a16a83cc6fe03b9afbd67d4 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -5,7 +5,7 @@
     </style>
 
     <style name="Theme.k9.Dialog.Base" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="android:windowBackground">@color/color_dialog_backgronund</item>
+        <item name="android:windowBackground">@drawable/dialog_background</item>
         <item name="android:colorAccent">@color/color_default_accent</item>
         <item name="android:textColorPrimary">@color/color_default_secondary_text</item>
         <item name="android:textColorSecondary">@color/color_default_secondary_text</item>
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
index 510b4e405c7268ac9af019a140c83c16a6e5faab..a6acc0d8681d9b204678634e44b8fcad93a5b5d1 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
@@ -1195,11 +1195,13 @@ public class MessageCompose extends K9Activity implements OnClickListener,
                 builder = new AlertDialog.Builder(context);
                 builder.setTitle(R.string.send_as);
                 final IdentityAdapter adapter = new IdentityAdapter(context);
+                adapter.setCurrentIdentity(identity);
                 builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         IdentityContainer container = (IdentityContainer) adapter.getItem(which);
                         onAccountChosen(container.account, container.identity);
+                        adapter.setCurrentIdentity(identity); // this needs to be called because, adapter is not initialize everytime. So it needs to be updated for next time
                     }
                 });
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java
index 00bc9469ac3882b49604f85093e029b09eecaf90..0215dc446c2d8bb1a167e2686078d14a77de8d46 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/IdentityAdapter.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.RadioButton;
 import android.widget.TextView;
 
 import com.fsck.k9.Account;
@@ -26,6 +27,7 @@ import java.util.List;
 public class IdentityAdapter extends BaseAdapter {
     private LayoutInflater mLayoutInflater;
     private List<Object> mItems;
+    private Identity currentIdentity;
 
     public IdentityAdapter(Context context) {
         mLayoutInflater = (LayoutInflater) context.getSystemService(
@@ -33,17 +35,28 @@ public class IdentityAdapter extends BaseAdapter {
 
         List<Object> items = new ArrayList<>();
         Preferences prefs = Preferences.getPreferences(context.getApplicationContext());
-        Collection<Account> accounts = prefs.getAccounts();
-        for (Account account : accounts) {
+        List<Account> accounts = prefs.getAccounts();
+
+        for (int i = 0; i < accounts.size(); i++) {
+            Account account = accounts.get(i);
             items.add(account);
             List<Identity> identities = account.getIdentities();
+
             for (Identity identity : identities) {
                 items.add(new IdentityContainer(identity, account));
             }
+
+            if (i < accounts.size() - 1) { // not the last item, so can add divider
+                items.add(new DividerContainer());
+            }
         }
         mItems = items;
     }
 
+    public void setCurrentIdentity(Identity currentIdentity) {
+        this.currentIdentity = currentIdentity;
+    }
+
     @Override
     public int getCount() {
         return mItems.size();
@@ -51,12 +64,22 @@ public class IdentityAdapter extends BaseAdapter {
 
     @Override
     public int getViewTypeCount() {
-        return 2;
+        return 3;
     }
 
     @Override
     public int getItemViewType(int position) {
-        return (mItems.get(position) instanceof Account) ? 0 : 1;
+        Object item = mItems.get(position);
+
+        if (item instanceof Account) {
+            return 0;
+        }
+
+        if (item instanceof IdentityContainer) {
+            return 1;
+        }
+
+        return 2;
     }
 
     @Override
@@ -82,8 +105,8 @@ public class IdentityAdapter extends BaseAdapter {
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         Object item = mItems.get(position);
-
         View view = null;
+
         if (item instanceof Account) {
             if (convertView != null && convertView.getTag() instanceof AccountHolder) {
                 view = convertView;
@@ -99,7 +122,9 @@ public class IdentityAdapter extends BaseAdapter {
             AccountHolder holder = (AccountHolder) view.getTag();
             holder.name.setText(account.getDisplayName());
             holder.chip.setBackgroundColor(account.getChipColor());
-        } else if (item instanceof IdentityContainer) {
+        }
+
+        else if (item instanceof IdentityContainer) {
             if (convertView != null && convertView.getTag() instanceof IdentityHolder) {
                 view = convertView;
             } else {
@@ -107,6 +132,7 @@ public class IdentityAdapter extends BaseAdapter {
                 IdentityHolder holder = new IdentityHolder();
                 holder.name = view.findViewById(R.id.name);
                 holder.description = view.findViewById(R.id.description);
+                holder.selected = view.findViewById(R.id.selected);
                 view.setTag(holder);
             }
 
@@ -115,13 +141,37 @@ public class IdentityAdapter extends BaseAdapter {
             IdentityHolder holder = (IdentityHolder) view.getTag();
             holder.name.setText(identity.getDescription());
             holder.description.setText(getIdentityDescription(identity));
+            holder.selected.setChecked(identity.equals(currentIdentity));
+        }
+
+        else if (item instanceof DividerContainer) {
+            if (convertView != null && convertView.getTag() instanceof DividerContainer) {
+                view = convertView;
+            } else {
+                view = mLayoutInflater.inflate(R.layout.choose_account_divider, parent, false);
+                DividerContainer holder = new DividerContainer();
+                view.setTag(holder);
+            }
         }
 
         return view;
     }
 
     private static String getIdentityDescription(Identity identity) {
-        return String.format("%s <%s>", identity.getName(), identity.getEmail());
+        StringBuilder stringBuilder = new StringBuilder();
+
+        if (identity.getName() != null && !identity.getName().trim().isEmpty()) {
+            stringBuilder.append(identity.getName())
+                    .append(" ");
+        }
+
+        if (identity.getEmail() != null && !identity.getEmail().trim().isEmpty()) {
+            stringBuilder.append("<")
+                    .append(identity.getEmail())
+                    .append(">");
+        }
+
+        return stringBuilder.toString();
     }
 
     /**
@@ -139,6 +189,9 @@ public class IdentityAdapter extends BaseAdapter {
         }
     }
 
+    private static class DividerContainer {
+    }
+
     static class AccountHolder {
         public TextView name;
         public View chip;
@@ -147,5 +200,6 @@ public class IdentityAdapter extends BaseAdapter {
     static class IdentityHolder {
         public TextView name;
         public TextView description;
+        public RadioButton selected;
     }
 }
diff --git a/app/ui/legacy/src/main/res/layout/choose_account_divider.xml b/app/ui/legacy/src/main/res/layout/choose_account_divider.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5b1a6602a85efdcb8d78151c3d0a70494ec4188
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/choose_account_divider.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022  E FOUNDATION
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="7dp">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="15dp"
+        android:background="@color/color_choose_account_divider" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/layout/choose_account_item.xml b/app/ui/legacy/src/main/res/layout/choose_account_item.xml
index 5ed88524dc58c011aa7e7b09ab303a88636dc88d..4a0efc844b1308a1dbe94208760dc35200b234a8 100644
--- a/app/ui/legacy/src/main/res/layout/choose_account_item.xml
+++ b/app/ui/legacy/src/main/res/layout/choose_account_item.xml
@@ -2,15 +2,17 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?attr/backgroundColorChooseAccountHeader"
+    android:paddingStart="24dp"
+    android:paddingEnd="15dp"
     android:gravity="start|center_vertical">
     <View
         android:id="@+id/chip"
         android:layout_height="fill_parent"
         android:layout_width="6dp"
+        android:visibility="invisible"
         tools:background="@sample/accounts.json/data/color"/>
 
     <TextView
@@ -20,10 +22,11 @@
         android:singleLine="true"
         android:ellipsize="end"
         android:paddingTop="8dp"
-        android:paddingStart="18dp"
-        android:paddingEnd="4dp"
-        android:paddingBottom="8dp"
+        android:paddingStart="43dp"
+        android:paddingEnd="0dp"
+        android:paddingBottom="6dp"
         android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         tools:text="@sample/accounts.json/data/name"/>
 
diff --git a/app/ui/legacy/src/main/res/layout/choose_identity_item.xml b/app/ui/legacy/src/main/res/layout/choose_identity_item.xml
index aef383d880c274a4d65192fe5f8ba65418452fc3..413e6975638030e71569c890f99ffdc2f0bd9d8f 100644
--- a/app/ui/legacy/src/main/res/layout/choose_identity_item.xml
+++ b/app/ui/legacy/src/main/res/layout/choose_identity_item.xml
@@ -1,33 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- Copyright (C) 2022  E FOUNDATION
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:orientation="vertical"
-    android:gravity="center_vertical"
-    android:paddingStart="12dp"
-    android:paddingEnd="4dp">
+    android:paddingStart="24dp"
+    android:paddingEnd="15dp"
+    android:paddingBottom="15dp">
+
+    <RadioButton
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:focusable="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/name"
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:layout_marginStart="17dp"
         android:ellipsize="end"
-        android:textColor="?android:attr/textColorPrimary"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/selected"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Initial identity" />
 
     <TextView
         android:id="@+id/description"
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:layout_marginStart="17dp"
         android:ellipsize="end"
-        android:textColor="?android:attr/textColorSecondary"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/selected"
+        app:layout_constraintTop_toBottomOf="@id/name"
         tools:text="Firstname Lastname &lt;user@domain.example&gt;" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/ui/legacy/src/main/res/values-night/colors.xml b/app/ui/legacy/src/main/res/values-night/colors.xml
index fc0dc3cdba3b4a137fd7982db7cc4e8676948040..7450b9070bc1ace968dbe05237a4ebc9c27e5c78 100644
--- a/app/ui/legacy/src/main/res/values-night/colors.xml
+++ b/app/ui/legacy/src/main/res/values-night/colors.xml
@@ -29,4 +29,5 @@
     <color name="color_drawer_header_background">#2e2e2e</color>
 
     <color name="color_message_list_thread_count_background">#1FFFFFFF</color>
+    <color name="color_choose_account_divider">#99FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index 27a0f0bdc01248c62d216a976c0d97cbcf63fe5b..294072159903a20f3b67ee336cd61b09ca1a5d81 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -54,4 +54,5 @@
     <color name="color_drawer_header_background">@android:color/white</color>
 
     <color name="color_message_list_thread_count_background">#14212121</color>
+    <color name="color_choose_account_divider">#D9D9D9</color>
 </resources>