X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-utils.c;h=aceeafbc7b63fbb7d7e2da47567df32bec5edde2;hp=fb7089d9ddf97f9c4349d3f97a71afcb6d3a72ff;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=cc379b2109f5c1b1a70419454d1a0e53c26559e6

diff --git a/src/modest-utils.c b/src/modest-utils.c
index fb7089d..aceeafb 100644
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -764,16 +764,19 @@ modest_utils_get_account_name_from_recipient (const gchar *from_header)
 		if (from) {
 			gchar *from_email = 
 				modest_text_utils_get_email_address (from);
+			gchar *from_header_email =
+				modest_text_utils_get_email_address (from_header);
 				
-			if (from_email) {
-				if (!modest_text_utils_utf8_strcmp (from_header, from_email, TRUE)) {
+			if (from_email && from_header_email) {
+				if (!modest_text_utils_utf8_strcmp (from_header_email, from_email, TRUE)) {
 					account_name = g_strdup (node->data);
 					g_free (from);
 					g_free (from_email);
 					break;
 				}
-				g_free (from_email);
 			}
+			g_free (from_email);
+			g_free (from_header_email);
 			g_free (from);
 		}
 	}