diff --git a/res/layout/accounts_password_prompt.xml b/res/layout/accounts_password_prompt.xml
index 59b33ecbd..55ae15037 100644
--- a/res/layout/accounts_password_prompt.xml
+++ b/res/layout/accounts_password_prompt.xml
@@ -9,7 +9,6 @@
     <!-- Intro text -->
     <TextView
       android:id="@+id/password_prompt_intro"
-      android:text="In order to be able to use the account &quot;Test&quot; you need to specify the server password(s)"
       android:textAppearance="?android:attr/textAppearanceMedium"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -18,7 +17,6 @@
     <!-- Password prompt for the incoming server -->
     <TextView
       android:id="@+id/password_prompt_incoming_server"
-      android:text="Incoming server (imap.googlemail.com):"
       android:textAppearance="?android:attr/textAppearanceSmall"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"/>
@@ -37,14 +35,13 @@
       android:layout_height="wrap_content">
       <TextView
         android:id="@+id/password_prompt_outgoing_server"
-        android:text="Outgoing server (smtp.googlemail.com):"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
       <CheckBox
         android:id="@+id/use_incoming_server_password"
         android:checked="true"
-        android:text="Use the incoming server password"
+        android:text="@string/settings_import_use_incoming_server_password"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
       <EditText
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20cc791c5..7b0409b04 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1087,6 +1087,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
         <item quantity="one">Setting password...</item>
         <item quantity="other">Setting passwords...</item>
     </plurals>
+    <string name="settings_import_use_incoming_server_password">Use the incoming server password</string>
     <string name="activate_account_action">Activate</string>
 
     <string name="settings_unknown_version">Unable to handle file of version <xliff:g id="version">%s</xliff:g></string>