diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index b095e30ad2..1d4e23523d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -29,9 +29,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -287,21 +285,6 @@ public class FragmentAccount extends FragmentBase {
             }
         });
 
-        etDomain.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
-
-            @Override
-            public void onTextChanged(CharSequence text, int start, int before, int count) {
-                btnAutoConfig.setEnabled(text.length() > 0);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-
         btnAutoConfig.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index e29aa854b9..085d9635ee 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -320,10 +320,10 @@ public class FragmentIdentity extends FragmentBase {
             }
 
             @Override
-            public void afterTextChanged(Editable s) {
-                SpannableStringBuilder ssb = new SpannableStringBuilder(s);
+            public void afterTextChanged(Editable editable) {
+                SpannableStringBuilder ssb = new SpannableStringBuilder(editable);
                 Helper.clearComposingText(ssb);
-                if (TextUtils.isEmpty(s.toString()))
+                if (TextUtils.isEmpty(editable.toString()))
                     etSignature.setTag(null);
                 else
                     etSignature.setTag(HtmlHelper.toHtml(ssb));
@@ -386,18 +386,11 @@ public class FragmentIdentity extends FragmentBase {
 
             @Override
             public void onTextChanged(CharSequence text, int start, int before, int count) {
-                btnAutoConfig.setEnabled(text.length() > 0);
             }
 
             @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
-
-        btnAutoConfig.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onAutoConfig();
+            public void afterTextChanged(Editable editable) {
+                btnAutoConfig.setEnabled(editable.length() > 0);
             }
         });