2010-11-17 [colin] 3.7.6cvs65

[claws.git] / src / common / utils.c

diff --git a/src/common/utils.c b/src/common/utils.c
index 03f81a3869af7c0cc1831f05cecf0c1710f07567..70cf95ca5c9f13e09fd57a9dc2e035354437b61f 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3854,20 +3854,15 @@ gchar *generate_msgid(gchar *buf, gint len, gchar *user_addr)
        lt = localtime_r(&t, &buft);
 
        if (strcmp(buf, "") == 0) {
-               if (user_addr != NULL) {
-                       addr = g_strconcat(user_addr, "@", get_domain_name(), NULL);
-               }
-               else {
+               if (user_addr != NULL)
+                       addr = g_strconcat(".", user_addr, "@", get_domain_name(), NULL);
+               else
                        addr = g_strconcat("@", get_domain_name(), NULL);
-               }
-       }
-       else {
-               if (user_addr != NULL) {
-                       addr = g_strconcat(user_addr, "@", buf, NULL);
-               }
-               else {
+       } else {
+               if (user_addr != NULL)
+                       addr = g_strconcat(".", user_addr, "@", buf, NULL);
+               else
                        addr = g_strconcat("@", buf, NULL);
-               }
        }
 
        /* Replace all @ but the last one in addr, with underscores.