X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=49372cce87bd729c610b36afa48fd9613783b2f2;hp=aead8afd0e73313b6caa252d1a5a3ed0850917c2;hb=fbb2640f53123b35a81e15c7e3a70ce601d40bed;hpb=1b908acde049d391f1f94971e04d149852b4d2e5

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index aead8af..49372cc 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -612,6 +612,7 @@ modest_text_utils_split_addresses_list (const gchar *addresses)
 	const gchar *my_addrs = addresses;
 	const gchar *end;
 	gchar *addr;
+	gboolean after_at = FALSE;
 
 	g_return_val_if_fail (addresses, NULL);
 	
@@ -626,11 +627,14 @@ modest_text_utils_split_addresses_list (const gchar *addresses)
 	/* nope, we are at the start of some address
 	 * now, let's find the end of the address */
 	end = my_addrs + 1;
-	while (end[0] && (end[0] != ';') && (end[0] != ',')) {
+	while (end[0] && end[0] != ';' && !(after_at && end[0] == ',')) {
 		if (end[0] == '\"') {
 			while (end[0] && end[0] != '\"')
 				++end;
 		}
+		if (end[0] == '@') {
+			after_at = TRUE;
+		}
 		if ((end[0] && end[0] == '>')&&(end[1] && end[1] == ',')) {
 			++end;
 			break;