diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index fa1632a4aa..215fe2aeae 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -121,7 +121,6 @@ public class FragmentCompose extends FragmentEx {
 
     private ViewGroup view;
     private Spinner spIdentity;
-    private ImageView ivIdentityAdd;
     private TextView tvExtraPrefix;
     private EditText etExtra;
     private TextView tvExtraSuffix;
@@ -171,7 +170,6 @@ public class FragmentCompose extends FragmentEx {
 
         // Get controls
         spIdentity = view.findViewById(R.id.spIdentity);
-        ivIdentityAdd = view.findViewById(R.id.ivIdentityAdd);
         tvExtraPrefix = view.findViewById(R.id.tvExtraPrefix);
         etExtra = view.findViewById(R.id.etExtra);
         tvExtraSuffix = view.findViewById(R.id.tvExtraSuffix);
@@ -221,18 +219,6 @@ public class FragmentCompose extends FragmentEx {
             }
         });
 
-        ivIdentityAdd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                FragmentIdentity fragment = new FragmentIdentity();
-                fragment.setArguments(new Bundle());
-
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                fragmentTransaction.replace(R.id.content_frame, fragment).addToBackStack("identity");
-                fragmentTransaction.commit();
-            }
-        });
-
         View.OnClickListener onPick = new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index adb301f707..9a42c07cdb 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -20,21 +20,10 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="6dp"
-                app:layout_constraintEnd_toStartOf="@+id/ivIdentityAdd"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/ivIdentityAdd"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="6dp"
-                android:layout_marginEnd="6dp"
-                android:src="@drawable/baseline_person_add_24"
-                app:layout_constraintBottom_toBottomOf="@id/spIdentity"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@id/spIdentity" />
-
             <TextView
                 android:id="@+id/tvExtraPrefix"
                 android:layout_width="wrap_content"