2007-11-08 [paul] 3.0.2cvs128

[claws.git] / src / messageview.c

diff --git a/src/messageview.c b/src/messageview.c
index 5d78c36a5f03af7c85b2a19049bc091dbed1b4bf..9210d2d6cec59ac2597151c590c284a6f4dfc0f1 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -840,13 +840,16 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        } else {
                g_snprintf(buf, sizeof(buf), "%s", "");
        }
-       generate_msgid(buf, sizeof(buf));
-       if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0) {
-               fclose(fp);
-               g_unlink(tmp);
-               return -1;
-       }
+       
+       if (account->gen_msgid) {
+               generate_msgid(buf, sizeof(buf));
 
+               if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0) {
+                       fclose(fp);
+                       g_unlink(tmp);
+                       return -1;
+               }
+       }
 
        if (fclose(fp) == EOF) {
                FILE_OP_ERROR(tmp, "fclose");