diff --git a/app/src/main/java/eu/faircode/email/FixedEditText.java b/app/src/main/java/eu/faircode/email/FixedEditText.java
index a6ff6597fa..6ca850c68e 100644
--- a/app/src/main/java/eu/faircode/email/FixedEditText.java
+++ b/app/src/main/java/eu/faircode/email/FixedEditText.java
@@ -21,7 +21,6 @@ package eu.faircode.email;
 
 import android.content.Context;
 import android.graphics.Canvas;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
@@ -98,20 +97,6 @@ public class FixedEditText extends AppCompatEditText {
         }
     }
 
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent event) {
-        // https://issuetracker.google.com/issues/37068143
-        if ((BuildConfig.DEBUG || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) &&
-                hasSelection() &&
-                event.getActionMasked() == MotionEvent.ACTION_DOWN) {
-            CharSequence text = getText();
-            setText(null);
-            setText(text);
-        }
-
-        return super.dispatchTouchEvent(event);
-    }
-
     @Override
     public boolean performLongClick() {
         try {
diff --git a/app/src/main/java/eu/faircode/email/FixedTextView.java b/app/src/main/java/eu/faircode/email/FixedTextView.java
index 126cc8bfe7..a96df457fe 100644
--- a/app/src/main/java/eu/faircode/email/FixedTextView.java
+++ b/app/src/main/java/eu/faircode/email/FixedTextView.java
@@ -111,9 +111,9 @@ public class FixedTextView extends AppCompatTextView {
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
         // https://issuetracker.google.com/issues/37068143
-        if ((BuildConfig.DEBUG || Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) &&
-                hasSelection() &&
-                event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+        if (event.getActionMasked() == MotionEvent.ACTION_DOWN &&
+                Build.VERSION.RELEASE.equals("6.0") && hasSelection()) {
+            // Remove selection
             CharSequence text = getText();
             setText(null);
             setText(text);