Index: camel/camel-folder-summary.c
===================================================================
--- camel/camel-folder-summary.c	(revision 9240)
+++ camel/camel-folder-summary.c	(working copy)
@@ -2624,7 +2624,7 @@
 summary_format_address(struct _camel_header_raw *h, const char *name, const char *charset)
 {
 	struct _camel_header_address *addr;
-	char *text, *str;
+	char *text, *str, *decoded;
 	
 	if (!(text = (char *) camel_header_raw_find (&h, name, NULL)))
 		return NULL;
@@ -2633,14 +2633,16 @@
 		text++;
 	
 	text = camel_header_unfold (text);
+	decoded = camel_header_decode_string (text, charset);
+	g_free (text);
 	
-	if ((addr = camel_header_address_decode (text, charset))) {
+	if ((addr = camel_header_address_decode (decoded, charset))) {
 		str = camel_header_address_list_format (addr);
 		camel_header_address_list_clear (&addr);
-		g_free (text);
 	} else {
-		str = text;
+		str = g_strdup(decoded);
 	}
+	g_free (decoded);
 	
 	return str;
 }
