diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0226756b1..9889c0bbb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1036,8 +1036,11 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
Exporting settings...
Importing settings...
Exported settings to %s
- Imported %s accounts from %s
- Imported 1 account from %s
+ Imported %s from %s
+
+ - 1 account
+ - %s accounts
+
Failed to export settings: %s
Failed to import settings from %s: %s
Export succeeded
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 0f46665c2..9d3542eb1 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -859,10 +859,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
@Override
public void success(int numAccounts) {
mHandler.progress(false);
- String messageText =
- numAccounts != 1
- ? Accounts.this.getString(R.string.settings_import_success_multiple, numAccounts, fileName)
- : Accounts.this.getString(R.string.settings_import_success_single, fileName);
+ String accountQtyText = getResources().getQuantityString(R.plurals.settings_import_success, numAccounts, numAccounts);
+ String messageText = getString(R.string.settings_import_success, accountQtyText, fileName);
showDialog(Accounts.this, R.string.settings_import_success_header, messageText);
runOnUiThread(new Runnable() {
@Override