diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 1d24089e4d..6b52382578 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1331,24 +1331,6 @@ public class FragmentCompose extends FragmentBase {
             }
         });
 
-        etTo.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence text, int start, int count, int after) {
-                // Do nothing
-            }
-
-            @Override
-            public void onTextChanged(CharSequence text, int start, int before, int count) {
-                // Do nothing
-            }
-
-            @Override
-            public void afterTextChanged(Editable text) {
-                if (TextUtils.isEmpty(text.toString().trim()))
-                    identity_selectable = true;
-            }
-        });
-
         grpAddresses.setVisibility(cc_bcc ? View.VISIBLE : View.GONE);
 
         ibRemoveAttachments.setVisibility(View.GONE);
@@ -1382,10 +1364,6 @@ public class FragmentCompose extends FragmentBase {
         if (TextUtils.isEmpty(email))
             return;
 
-        if (!identity_selectable)
-            return;
-        identity_selectable = false;
-
         Bundle args = new Bundle();
         args.putString("email", email);
 
@@ -5494,8 +5472,6 @@ public class FragmentCompose extends FragmentBase {
                     }
                 }
 
-            identity_selectable = (data.draft.to == null || data.draft.to.length == 0);
-
             etExtra.setText(data.draft.extra);
             etTo.setText(MessageHelper.formatAddressesCompose(data.draft.to));
             etCc.setText(MessageHelper.formatAddressesCompose(data.draft.cc));