X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=13eca36981697ddc3d162bfccf3bdc61708f5712;hp=2fa174c83b6783ec3584469c1a02f012e436c1df;hb=4a97c4a2b6ba57b415de727f389f44505f032824;hpb=fb9c95e849f3049ddb22d486392e0bf7588867cb

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 2fa174c..13eca36 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -941,28 +941,19 @@ open_msg_cb (ModestMailOperation *mail_op,
 		if (from_header) {
 			GSList *accounts = modest_account_mgr_account_names (mgr, TRUE);
 			GSList *node = NULL;
-			gchar *from_header_email;
-
-			from_header_email = modest_text_utils_get_email_address ((const gchar *) from_header);
 
 			for (node = accounts; node != NULL; node = g_slist_next (node)) {
-				gchar *from, *from_email;
-				
-				from = modest_account_mgr_get_from_string (mgr, node->data);
-				if (from) {
-					from_email = modest_text_utils_get_email_address ((const gchar *) from);
-					if (strcmp (from_header_email, from_email) == 0) {
-						g_free (account);
-						account = g_strdup (node->data);
-						g_free (from_email);
-						g_free (from);
-						break;
-					}
-					g_free (from_email);
+				gchar *from = modest_account_mgr_get_from_string (mgr, node->data);
+ 				
+				if (from && (strcmp (from_header, from) == 0)) {
+					g_free (account);
+					account = g_strdup (node->data);
 					g_free (from);
-				}
-			}
-			g_free (from_header_email);
+					break;
+ 				}
+				g_free (from);
+ 			}
+
 			g_free (from_header);
 			g_slist_foreach (accounts, (GFunc) g_free, NULL);
 			g_slist_free (accounts);