diff --git a/res/values/strings.xml b/res/values/strings.xml
index 599722441..d7e8f4902 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1028,14 +1028,16 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="messagelist_sent_to_me_sigil">»</string>
     <string name="messagelist_sent_cc_me_sigil">›</string>
     <string name="error_unable_to_connect">Unable to connect.</string>
-    
-    <string name="settings_encryption_password_prompt">Enter settings encryption password:</string>
+
+    <string name="import_export_action">Settings Import &amp; Export</string>
+    <string name="settings_export_encryption_password_prompt">Please enter a password to protect your exported settings:</string>
+    <string name="settings_import_encryption_password_prompt">Please enter the password you used when exporting your settings:</string>
     <string name="settings_export_account">Export account settings</string>
-    <string name="settings_export_all">Export all settings</string>
+    <string name="settings_export_all">Export settings and accounts</string>
     <string name="settings_import">Import settings</string>
     <string name="settings_exporting">Exporting settings...</string>
     <string name="settings_importing">Importing settings...</string>
-    <string name="settings_export_success">Exported settings to <xliff:g id="filename">%s</xliff:g></string>
+    <string name="settings_export_success">Saved exported settings to <xliff:g id="filename">%s</xliff:g></string>
     <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>
     <plurals name="settings_import_success">
         <item quantity="one">1 account</item>
diff --git a/src/com/fsck/k9/preferences/StorageExporter.java b/src/com/fsck/k9/preferences/StorageExporter.java
index 4375bed1c..ed311d45a 100644
--- a/src/com/fsck/k9/preferences/StorageExporter.java
+++ b/src/com/fsck/k9/preferences/StorageExporter.java
@@ -48,7 +48,7 @@ public class StorageExporter {
 
             @Override
             public void run() {
-                PasswordEntryDialog dialog = new PasswordEntryDialog(activity, activity.getString(R.string.settings_encryption_password_prompt),
+                PasswordEntryDialog dialog = new PasswordEntryDialog(activity, activity.getString(R.string.settings_export_encryption_password_prompt),
                 new PasswordEntryDialog.PasswordEntryListener() {
                     public void passwordChosen(final String chosenPassword) {
 
diff --git a/src/com/fsck/k9/preferences/StorageImporter.java b/src/com/fsck/k9/preferences/StorageImporter.java
index fdeecc656..57038af80 100644
--- a/src/com/fsck/k9/preferences/StorageImporter.java
+++ b/src/com/fsck/k9/preferences/StorageImporter.java
@@ -83,7 +83,7 @@ public class StorageImporter {
         activity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                PasswordEntryDialog dialog = new PasswordEntryDialog(activity, activity.getString(R.string.settings_encryption_password_prompt),
+                PasswordEntryDialog dialog = new PasswordEntryDialog(activity, activity.getString(R.string.settings_import_encryption_password_prompt),
                 new PasswordEntryDialog.PasswordEntryListener() {
                     public void passwordChosen(final String chosenPassword) {
                         AsyncUIProcessor.getInstance(activity.getApplication()).execute(new Runnable() {