diff --git a/OpenKeychain/src/main/res/layout/admin_pin_dialog.xml b/OpenKeychain/src/main/res/layout/admin_pin_dialog.xml
index c2909cf4c..7186a2129 100644
--- a/OpenKeychain/src/main/res/layout/admin_pin_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/admin_pin_dialog.xml
@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:hint="@string/token_hint_admin_pin"
         android:id="@+id/admin_pin_current"
+        android:imeOptions="flagNoPersonalizedLearning"
         android:inputType="numberPassword|textVisiblePassword" />
 
     <EditText
@@ -19,6 +20,7 @@
         android:layout_height="wrap_content"
         android:hint="@string/token_hint_new_pin"
         android:id="@+id/pin_new"
+        android:imeOptions="flagNoPersonalizedLearning"
         android:inputType="numberPassword|textVisiblePassword" />
 
     <EditText
@@ -26,6 +28,7 @@
         android:layout_height="wrap_content"
         android:hint="@string/token_hint_new_pin_repeat"
         android:id="@+id/pin_new_repeat"
+        android:imeOptions="flagNoPersonalizedLearning"
         android:inputType="numberPassword|textVisiblePassword" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
index c3b73d91f..bce1b7406 100644
--- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
@@ -41,6 +41,7 @@
                 android:layout_marginBottom="8dp"
                 android:ems="10"
                 android:hint="@string/create_key_yubi_key_pin"
+                android:imeOptions="flagNoPersonalizedLearning"
                 android:inputType="numberPassword" />
 
             <EditText
@@ -50,6 +51,7 @@
                 android:layout_marginBottom="8dp"
                 android:ems="10"
                 android:hint="@string/create_key_yubi_key_pin_repeat"
+                android:imeOptions="flagNoPersonalizedLearning"
                 android:inputType="numberPassword" />
 
             <TextView
diff --git a/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
index c77eea985..1355f88b4 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:imeOptions="actionNext"
+        android:imeOptions="actionNext|flagNoPersonalizedLearning"
         android:inputType="textPassword"
         android:hint="@string/label_passphrase"
         android:ems="10"
@@ -23,6 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
+        android:imeOptions="flagNoPersonalizedLearning"
         android:inputType="textPassword"
         android:hint="@string/label_passphrase_again"
         android:ems="10"
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
index 171ad46f9..6d8064ab5 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml
@@ -33,7 +33,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:imeOptions="actionDone"
+                android:imeOptions="actionDone|flagNoPersonalizedLearning"
                 android:hint="@string/label_passphrase"
                 android:ems="10"
                 android:layout_weight="1"
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
index 1eb55b3f6..582bcc672 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_dialog_backup_code.xml
@@ -44,6 +44,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="ABCD"
+                    android:imeOptions="flagNoPersonalizedLearning"
                     android:inputType="textNoSuggestions|textCapCharacters"
                     android:maxLength="4"
                     android:singleLine="true"
@@ -69,6 +70,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="ABCD"
+                    android:imeOptions="flagNoPersonalizedLearning"
                     android:inputType="textNoSuggestions|textCapCharacters"
                     android:maxLength="4"
                     android:singleLine="true"
@@ -94,6 +96,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="ABCD"
+                    android:imeOptions="flagNoPersonalizedLearning"
                     android:inputType="textNoSuggestions|textCapCharacters"
                     android:maxLength="4"
                     android:singleLine="true"
@@ -127,6 +130,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="ABCD"
+                    android:imeOptions="flagNoPersonalizedLearning"
                     android:inputType="textNoSuggestions|textCapCharacters"
                     android:maxLength="4"
                     android:singleLine="true"
@@ -152,6 +156,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="ABCD"
+                    android:imeOptions="flagNoPersonalizedLearning"
                     android:inputType="textNoSuggestions|textCapCharacters"
                     android:maxLength="4"
                     android:singleLine="true"
@@ -177,6 +182,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="ABCD"
+                    android:imeOptions="flagNoPersonalizedLearning"
                     android:inputType="textNoSuggestions|textCapCharacters"
                     android:maxLength="4"
                     android:singleLine="true"
diff --git a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
index c2330f31d..de402af29 100644
--- a/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
+++ b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:imeOptions="actionNext"
+        android:imeOptions="actionNext|flagNoPersonalizedLearning"
         android:hint="@string/label_passphrase"
         android:inputType="textPassword"
         android:ems="10"
@@ -32,7 +32,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:imeOptions="actionDone"
+        android:imeOptions="actionDone|flagNoPersonalizedLearning"
         android:inputType="textPassword"
         android:hint="@string/label_passphrase_again"
         android:ems="10"
diff --git a/OpenKeychain/src/main/res/layout/transfer_code_input.xml b/OpenKeychain/src/main/res/layout/transfer_code_input.xml
index 8b74a388f..ba797c2e1 100644
--- a/OpenKeychain/src/main/res/layout/transfer_code_input.xml
+++ b/OpenKeychain/src/main/res/layout/transfer_code_input.xml
@@ -16,6 +16,7 @@
 
         <org.sufficientlysecure.keychain.ui.widget.PrefixedEditText
             android:id="@+id/transfer_code_block_1"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             custom:prefixColor="@color/md_grey_600"
@@ -31,6 +32,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_2"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText" />
@@ -42,6 +44,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_3"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"
@@ -61,6 +64,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_4"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"
@@ -73,6 +77,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_5"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"
@@ -85,6 +90,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_6"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"
@@ -104,6 +110,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_7"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"
@@ -116,6 +123,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_8"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"
@@ -128,6 +136,7 @@
 
         <EditText
             android:id="@+id/transfer_code_block_9"
+            android:imeOptions="flagNoPersonalizedLearning"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             style="@style/TransferCodeText"