X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-text-utils.c;h=15405e82bfc387a9de69b4843bc35f01aaec3f90;hp=99cb7107410146b5481e8a5c2f5c15ac4d03df15;hb=b2820dc1b13a08ff616aaf842c5f451353df0f38;hpb=c8865f8136111276c5f1f21819272c208ed97532

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index 99cb710..15405e8 100644
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -1699,6 +1699,7 @@ modest_text_utils_validate_recipient (const gchar *recipient, const gchar **inva
 
 	/* quoted string */
 	if (*current == '\"') {
+		gchar *last_quote = NULL;
 		current = g_utf8_next_char (current);
 		has_error = TRUE;
 		for (; *current != '\0'; current = g_utf8_next_char (current)) {
@@ -1714,9 +1715,11 @@ modest_text_utils_validate_recipient (const gchar *recipient, const gchar **inva
 			} else if (*current == '\"') {
 				has_error = FALSE;
 				current = g_utf8_next_char (current);
-				break;
+				last_quote = current;
 			}
 		}
+		if (last_quote)
+			current = last_quote;
 	} else {
 		has_error = TRUE;
 		for (current = stripped ; *current != '\0'; current = g_utf8_next_char (current)) {
@@ -1736,6 +1739,9 @@ modest_text_utils_validate_recipient (const gchar *recipient, const gchar **inva
 	g_free (stripped);
 	right_part = g_strstrip (right_part);
 
+	if (g_str_has_suffix (right_part, ",") || g_str_has_suffix (right_part, ";"))
+               right_part [(strlen (right_part) - 1)] = '\0';
+
 	if (g_str_has_prefix (right_part, "<") &&
 	    g_str_has_suffix (right_part, ">")) {
 		gchar *address;