* Fixes NB#95165, remove duplicate addresses in Cc when "reply to all"

[modest] / src / modest-text-utils.c

diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c
index bb4da39..aead8af 100644 (file)
--- a/src/modest-text-utils.c
+++ b/src/modest-text-utils.c
@@ -626,7 +626,7 @@ 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] != ';') {
+       while (end[0] && (end[0] != ';') && (end[0] != ',')) {
                if (end[0] == '\"') {
                        while (end[0] && end[0] != '\"')
                                ++end;
@@ -1629,9 +1629,7 @@ modest_text_utils_get_display_size (guint64 size)
        const guint MB=1024 * KB;
        const guint GB=1024 * MB;
 
-       if (size == 0)
-               return g_strdup_printf(_FM("sfil_li_size_kb"), 0);
-       if (0 < size && size < KB)
+       if (0 <= size && size < KB)
                return g_strdup_printf (_FM("sfil_li_size_kb"), 1);
        else if (KB <= size && size < 100 * KB)
                return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), size / KB);