X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b3f43fa01b5b8511bf22ff4781e6194cf2a5ab54..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/mail/0508.postmaster

diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index d2ead9f04..525794c74 100644
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -1,15 +1,22 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-	id 10HmaY-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-000000005vi-0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@test.ex
+References: <E10HmaX-000000005vi-0000@myhost.test.ex>
+Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+MIME-Version: 1.0
 Subject: Mail delivery failed
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: text/plain; charset=us-ascii
+
 This message was created automatically by mail delivery software.
 
 A message sent by
@@ -29,14 +36,27 @@ The following text was generated during the delivery attempt:
 
 Some pipe output
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; myhost.test.ex
+
+Action: failed
+Final-Recipient: rfc822;userx@myhost.test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
-	id 10HmaX-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+	id 10HmaX-000000005vi-0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+