X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpqueue.c;h=c9cfbecbd78f6ebd76af04ae3f34b805246d10f5;hb=ca5ae83cef63ed80a8d8f553abc88d165c1e6c93;hp=058f3673d3e6eb548dade465af26c3de621b8622;hpb=a1ff38c40375ef988a168fc6eb6a2060042077d4;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 058f3673d..c9cfbecbd 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -471,8 +471,10 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 	/* Deliver the bounce if there's anything worth mentioning */
 	CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
 
-	if (num_bounces == 0)
+	if (num_bounces == 0) {
+		FreeStrBuf(&Msg);
 		return;
+	}
 
 	boundary = NewStrBufPlain(HKEY("=_Citadel_Multipart_"));
 	StrBufAppendPrintf(boundary, "%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
@@ -552,9 +554,10 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
         bmsg->cm_format_type = FMT_RFC822;
 
         bmsg->cm_fields['O'] = strdup(MAILROOM);
+        bmsg->cm_fields['A'] = strdup("Citadel");
         bmsg->cm_fields['N'] = strdup(config.c_nodename);
         bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
-	bmsg->cm_fields['A'] = SmashStrBuf(&BounceMB);
+	bmsg->cm_fields['M'] = SmashStrBuf(&BounceMB);
 
 	/* First try the user who sent the message */
 	if (StrLength(MyQItem->BounceTo) == 0)