diff --git a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
new file mode 100644
index 0000000000..6065529642
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
@@ -0,0 +1,44 @@
+package eu.faircode.email;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2021 by Marcel Bokhorst (M66B)
+*/
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView;
+
+public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextView {
+    public EditTextMultiAutoComplete(@NonNull Context context) {
+        super(context);
+        Helper.setKeyboardIncognitoMode(this, context);
+    }
+
+    public EditTextMultiAutoComplete(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        Helper.setKeyboardIncognitoMode(this, context);
+    }
+
+    public EditTextMultiAutoComplete(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        Helper.setKeyboardIncognitoMode(this, context);
+    }
+}
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index e7386be322..b7c48d0bd1 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -78,7 +78,7 @@
                     app:layout_constraintTop_toTopOf="@+id/etTo"
                     app:srcCompat="@drawable/twotone_person_24" />
 
-                <MultiAutoCompleteTextView
+                <eu.faircode.email.EditTextMultiAutoComplete
                     android:id="@+id/etTo"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
                     app:layout_constraintTop_toTopOf="@+id/etCc"
                     app:srcCompat="@drawable/twotone_people_24" />
 
-                <MultiAutoCompleteTextView
+                <eu.faircode.email.EditTextMultiAutoComplete
                     android:id="@+id/etCc"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -158,7 +158,7 @@
                     app:layout_constraintTop_toTopOf="@+id/etBcc"
                     app:srcCompat="@drawable/twotone_people_outline_24" />
 
-                <MultiAutoCompleteTextView
+                <eu.faircode.email.EditTextMultiAutoComplete
                     android:id="@+id/etBcc"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"