diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index 40b6b3eda0..7a5f1dbcc6 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -89,6 +89,7 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginEnd="6dp"
                     android:background="@null"
+                    android:completionThreshold="2"
                     android:dropDownVerticalOffset="0dp"
                     android:hint="@string/title_to"
                     android:imeOptions="actionNext"
@@ -150,6 +151,7 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginEnd="6dp"
                     android:background="@null"
+                    android:completionThreshold="2"
                     android:dropDownVerticalOffset="0dp"
                     android:hint="@string/title_cc"
                     android:imeOptions="actionNext"
@@ -196,6 +198,7 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginEnd="6dp"
                     android:background="@null"
+                    android:completionThreshold="2"
                     android:dropDownVerticalOffset="0dp"
                     android:hint="@string/title_bcc"
                     android:imeOptions="actionNext"