diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index caf831c61..acd9145f9 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -230,7 +230,7 @@ Vítejte v nastavení pošty K-9 Mail.  K-9 je open source poštovní klient pro
         <xliff:g id="sending">%s</xliff:g>
         <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Načti více zpráv</string>
-    <string name="message_list_to_fmt">Komu:</string>
+    <string name="message_list_to_fmt">Komu:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Smazat</string>
     <string name="message_list_mark_read_action">Označit jako přečtené</string>
     <string name="message_list_mark_unread_action">Označit jako nepřečtené</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 06cca28cc..f19949cc6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -240,7 +240,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Weitere Nachrichten abrufen</string>
-    <string name="message_list_to_fmt">An:</string>
+    <string name="message_list_to_fmt">An:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Löschen</string>
     <string name="message_list_mark_read_action">Gelesen</string>
     <string name="message_list_mark_unread_action">Nicht gelesen</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4a78aa56e..be348b828 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -238,7 +238,7 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiaka
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Hae lisää viestejä</string>
-    <string name="message_list_to_fmt">Vast.ottaja:</string>
+    <string name="message_list_to_fmt">Vast.ottaja:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Poista</string>
     <string name="message_list_mark_read_action">Merkitse luetuksi</string>
     <string name="message_list_mark_unread_action">Merkitse lukemattomaksi</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 68a98543c..015b74cf1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -227,7 +227,7 @@
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
   <string name="message_list_load_more_messages_action">Charger plus de messages</string>
-  <string name="message_list_to_fmt">Pour\u00A0: </string>
+  <string name="message_list_to_fmt">Pour\u00A0: <xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_list_delete_action">Supprimer</string>
   <string name="message_list_mark_read_action">Marquer comme lu</string>
   <string name="message_list_mark_unread_action">Marquer comme non lu</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5a31044d5..057075ddf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -62,7 +62,7 @@
 	<string name="end_of_folder">Non vi sono altri messaggi</string>
 	<string name="message_header_mua">K-9 per Android <xliff:g id="version">%s</xliff:g></string>
 	<string name="message_compose_content_hint">Testo del messaggio</string>
-	<string name="message_list_to_fmt">A:</string>
+	<string name="message_list_to_fmt">A:<xliff:g id="counterParty">%s</xliff:g></string>
 	<string name="message_view_from_format">Da: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
 	<string name="message_view_cc_label">Cc:</string>
 	<string name="message_delete_failed">Impossibile cancellare il messaggio</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 24de990e8..c80a6eab7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -235,7 +235,7 @@ K-9 Mail セットアップにようこそ。\nK-9 はオープンソースで
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">他メールを読込</string>
-    <string name="message_list_to_fmt">宛先:</string>
+    <string name="message_list_to_fmt">宛先:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">削除</string>
     <string name="message_list_mark_read_action">既読にする</string>
     <string name="message_list_mark_unread_action">未読にする</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1438a9d3c..120f9215b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -239,7 +239,7 @@ Welkom bij K-9 Mail setup.  K-9 is een open source mail cli??nt voor Android, ge
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Laad meer berichten</string>
-    <string name="message_list_to_fmt">Aan:</string>
+    <string name="message_list_to_fmt">Aan:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Verwijder</string>
     <string name="message_list_mark_read_action">Markeer als gelezen</string>
     <string name="message_list_mark_unread_action">Markeer als ongelezen</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b036ba1d3..329e011dc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -238,7 +238,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Pobierz więcej wiadomości</string>
-    <string name="message_list_to_fmt">Do:</string>
+    <string name="message_list_to_fmt">Do:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Usuń</string>
     <string name="message_list_mark_read_action">Przecz.</string>
     <string name="message_list_mark_unread_action">Nieprz.</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 621825ab8..3b696188c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -217,7 +217,7 @@
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Загрузить болюше сообщений</string>
-    <string name="message_list_to_fmt">Для:</string>
+    <string name="message_list_to_fmt">Для:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Удалить</string>
     <string name="message_list_mark_read_action">Отметить как прочитанное</string>
     <string name="message_list_mark_unread_action">Отметить как непрочитанное</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8233de07d..127fecbd7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -240,7 +240,7 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
                        <xliff:g id="sending">%s</xliff:g>
                        <xliff:g id="push">%s</xliff:g></string>
     <string name="message_list_load_more_messages_action">Load more messages</string>
-    <string name="message_list_to_fmt">To:</string>
+    <string name="message_list_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
     <string name="message_list_delete_action">Delete</string>
     <string name="message_list_mark_read_action">Mark read</string>
     <string name="message_list_mark_unread_action">Mark unread</string>
diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java
index ffc076862..5487cb6a4 100644
--- a/src/com/fsck/k9/helper/MessageHelper.java
+++ b/src/com/fsck/k9/helper/MessageHelper.java
@@ -89,7 +89,7 @@ public class MessageHelper
             {
                 CharSequence to = Address.toFriendly(message .getRecipients(RecipientType.TO), contactHelper);
                 target.compareCounterparty = to.toString();
-                target.sender = new SpannableStringBuilder(mContext.getString(R.string.message_list_to_fmt)).append(to);
+                target.sender = new SpannableStringBuilder(String.format(mContext.getString(R.string.message_list_to_fmt), to));
             }
             else
             {