diff --git a/app/src/main/java/eu/faircode/email/FixedEditText.java b/app/src/main/java/eu/faircode/email/FixedEditText.java
index 9d6d1493d7..abba89b6a3 100644
--- a/app/src/main/java/eu/faircode/email/FixedEditText.java
+++ b/app/src/main/java/eu/faircode/email/FixedEditText.java
@@ -201,7 +201,7 @@ public class FixedEditText extends AppCompatEditText {
               at android.widget.SelectionActionModeHelper$TextClassificationAsyncTask.doInBackground(SelectionActionModeHelper.java:567)
               at android.os.AsyncTask$2.call(AsyncTask.java:333)
          */
-        if (BuildConfig.DEBUG || Helper.isSamsung())
+        if (BuildConfig.DEBUG /*|| Helper.isSamsung()*/)
             return TextClassifier.NO_OP;
         else
             return super.getTextClassifier();