diff -up evolution-data-server-2.22.3/camel/camel-folder-summary.c.rfc2047 evolution-data-server-2.22.3/camel/camel-folder-summary.c
--- evolution-data-server-2.22.3/camel/camel-folder-summary.c.rfc2047	2008-07-30 11:38:14.000000000 +0200
+++ evolution-data-server-2.22.3/camel/camel-folder-summary.c	2008-07-30 11:38:14.000000000 +0200
@@ -1671,16 +1671,18 @@ summary_format_address(struct _camel_hea
 {
 	struct _camel_header_address *addr;
 	const char *text;
-	char *ret;
+	char *ret, *decoded;
 
 	text = camel_header_raw_find (&h, name, NULL);
-	addr = camel_header_address_decode (text, charset);
+	decoded = camel_header_decode_string (text, charset);
+	addr = camel_header_address_decode (decoded, charset);
 	if (addr) {
 		ret = camel_header_address_list_format (addr);
 		camel_header_address_list_clear (&addr);
 	} else {
-		ret = g_strdup (text);
+		ret = g_strdup (decoded);
 	}
+	g_free(decoded);
 
 	return ret;
 }
