From: Paul <paul@claws-mail.org>
Date: Thu, 21 Jun 2018 09:54:11 +0000 (+0100)
Subject: fix bug, 'MDN mail-accountname leak'
X-Git-Tag: 3.17.0~56
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=638d5b064290083675d7a9408f742390e08eddf3

fix bug, 'MDN mail-accountname leak'

always use whatever is in the To header for the From header when sending
Return Receipts
---

diff --git a/src/messageview.c b/src/messageview.c
index 066f6dc57..652d06fc8 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -970,19 +970,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		goto FILE_ERROR;
 
 	/* From */
-	if (account->name && *account->name) {
-		notification_convert_header(&buf, account->name, strlen("From: "));
-		if (buf == NULL)
-			goto FILE_ERROR;
-		if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0) {
-			g_free(buf);
-			goto FILE_ERROR;
-		}
-		g_free(buf);
-		buf = NULL;
-	} else
-		if (fprintf(fp, "From: %s\n", account->address) < 0)
-			goto FILE_ERROR;
+	if (fprintf(fp, "From: %s\n", msginfo->to) < 0)
+		goto FILE_ERROR;
 
 	if (fprintf(fp, "To: %s\n", to) < 0)
 		goto FILE_ERROR;