diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index da2f4d74a6..6e1d0b7c38 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -274,11 +274,8 @@ public class FragmentIdentity extends FragmentBase {
 
             @Override
             public void afterTextChanged(Editable editable) {
-                String email = editable.toString();
-                if (email.contains("@"))
-                    etDomain.setText(email.split("@")[1]);
-                else
-                    etDomain.setText(null);
+                String[] email = editable.toString().split("@");
+                etDomain.setText(email.length < 2 ? null : email[1]);
             }
         });