diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index e21cdd832e..d3f101e4eb 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -116,7 +116,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:gravity="center_horizontal"
-            android:text="@string/title_imap"
+            android:text="@string/title_setup_quick_imap"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
@@ -138,7 +138,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:gravity="center_horizontal"
-            android:text="@string/title_smtp"
+            android:text="@string/title_setup_quick_smtp"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImap" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5d390c208..46cb989b87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -105,6 +105,8 @@
     <string name="title_setup_quick">Quick setup</string>
     <string name="title_setup_quick_remark">To quickly setup an account and identity for most major providers</string>
     <string name="title_setup_quick_hint">The quick setup will fetch configuration information from autoconfig.thunderbird.net</string>
+    <string name="title_setup_quick_imap">IMAP server to receive message</string>
+    <string name="title_setup_quick_smtp">SMTP server to send messages</string>
     <string name="title_setup_go">Go</string>
     <string name="title_setup_setting_gmail">Enable access for "less secure" apps</string>
     <string name="title_setup_no_settings">No settings found for \'%1$s\'</string>
@@ -174,7 +176,7 @@
     <string name="title_advanced_autosend">Confirm sending messages</string>
 
     <string name="title_advanced_notify_preview">Show message preview in notifications</string>
-    <string name="title_advanced_search_local">Search on device</string>
+    <string name="title_advanced_search_local">External search on device</string>
     <string name="title_advanced_light">Use notification light</string>
     <string name="title_advanced_sound">Select notification sound</string>
     <string name="title_advanced_updates">Check for updates</string>