From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 6 Mar 2012 21:53:37 +0000 (+0100)
Subject: SMTP-Bounce-Message: separate mime header by \r\n
X-Git-Tag: v8.11~139
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=9a85a6797e7e424012e6bfb5955de7d579825150

SMTP-Bounce-Message: separate mime header by \r\n
---

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index c51b43c16..2292df1c4 100644
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -630,7 +630,7 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 	}
 
 	/* Attach the original message */
-	StrBufAppendBufPlain(BounceMB, HKEY("--"), 0);
+	StrBufAppendBufPlain(BounceMB, HKEY("\r\n--"), 0);
 	StrBufAppendBuf(BounceMB, boundary, 0);
 	StrBufAppendBufPlain(BounceMB, HKEY("\r\n"), 0);
 	StrBufAppendBufPlain(BounceMB,