From 272bb699c975fa1d9e43881d9679120bc77a219e Mon Sep 17 00:00:00 2001
From: Daniel Applebaum <danapple@danapple.com>
Date: Thu, 12 Mar 2009 01:31:55 +0000
Subject: [PATCH] Use format, instead of hardcoded concatenation, for
 formatting recipient display.  (suggested by dumbfile in Comment 12 of Issue
 10)

---
 res/values/strings.xml                                | 4 ++--
 src/com/android/email/activity/FolderMessageList.java | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b082aa652..7a0ed2b7e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -170,8 +170,8 @@ Welcome to K-9 Mail setup.  K-9 is an open source email client for Android based
     <string name="message_compose_downloading_attachments_toast">Some attachments were not downloaded. They will be downloaded automatically before this message is sent.</string>
     <string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not downloaded.</string>
 
-    <string name="folder_message_list_to_label">To:</string>
-    
+    <string name="folder_message_list_to_fmt">To:<xliff:g id="counterParty">%s</xliff:g></string>
+ 
     <string name="message_view_to_label">To:</string>
     <string name="message_view_attachment_view_action">Open</string>
     <string name="message_view_attachment_download_action">Save</string>
diff --git a/src/com/android/email/activity/FolderMessageList.java b/src/com/android/email/activity/FolderMessageList.java
index b50027a93..4086a1e1d 100644
--- a/src/com/android/email/activity/FolderMessageList.java
+++ b/src/com/android/email/activity/FolderMessageList.java
@@ -2275,8 +2275,7 @@ public class FolderMessageList extends ExpandableListActivity
 						
 						this.compareCounterparty = Address.toFriendly(message
                 .getRecipients(RecipientType.TO));
-						
-						this.sender = getString(R.string.folder_message_list_to_label) + this.compareCounterparty;
+						this.sender = String.format(getString(R.string.folder_message_list_to_fmt), this.compareCounterparty);
 						
 					} else
 					{