Another MIME fix.

svn path=/trunk/; revision=2239

2 files changed, 8 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 267b3714..00ae8d99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 				Release Notes:
 
+4.7.0 ():
+* Peter Hamlen's fix for bounce-message generation.
+
+Feature freeze is in effect!
+
+There are 247 people on fetchmail-friends and 309 on fetchmail-announce.
+
 fetchmail-4.6.9 ():
 * Better RFC822 conformance in fetchmail trace headers.
 * Corrected MIME generation of bounce mail.
diff --git a/sink.c b/sink.c
index 0ef2b7e4..e5d9ca79 100644
--- a/sink.c
+++ b/sink.c
@@ -286,7 +286,7 @@ static int send_bouncemail(struct msgblk *msg,
     SockPrintf(sock, "From: FETCHMAIL-DAEMON@%s\r\n", fetchmailhost);
     SockPrintf(sock, "To: %s\n", msg->return_path);
     SockPrintf(sock, "MIME-Version: 1.0\r\n");
-    SockPrintf(sock, "Content-Type: multipart/report; report-type=text/plain; boundary=\"%s\"\r\n", boundary);
+    SockPrintf(sock, "Content-Type: multipart/report; report-type=delivery-status boundary=\"%s\"\r\n", boundary);
     SockPrintf(sock, "\r\n");
     SockPrintf(sock, "Content-Transfer-Encoding: 7bit\r\n");
     SockPrintf(sock, "\r\n");