talons

commit d661fd7233e971a190b54ef3fa1dac1861f44833
parent 61ec4cae4410ebe0ecb652c7c96000301950ecc8
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Wed, 31 May 2017 21:10:19 +0200

Only preserve existing Message-ID when reediting a draft.

This is a followup to commit e22cbed1f.
Closes Bug 3828 - "Re-edit" should not recycle the Message-ID header

Diffstat:
M
src/compose.c
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/compose.c b/src/compose.c
@@ -2981,7 +2981,9 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
 		if (msginfo->inreplyto && *msginfo->inreplyto)
 			compose->inreplyto = g_strdup(msginfo->inreplyto);
 
-		if (msginfo->msgid && *msginfo->msgid)
+		if (msginfo->msgid && *msginfo->msgid &&
+				compose->folder != NULL &&
+				compose->folder->stype ==  F_DRAFT)
 			compose->msgid = g_strdup(msginfo->msgid);
 	} else {
 		if (msginfo->msgid && *msginfo->msgid)