X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b3f43fa01b5b8511bf22ff4781e6194cf2a5ab54..2c3ac6dd18dbf1f048a7054a85879dbf90c1e7f4:/test/mail/5204.CALLER

diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index d468c4a9d..c1c378181 100644
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -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 CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-000000005vi-0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@some.host
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.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: returning message to sender
-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 that you sent could not be delivered to one or more of its
@@ -18,16 +25,29 @@ recipients. This is a permanent error. The following address(es) failed:
   "FAIL cannot route this one (FAIL)"@some.host
     cannot route this one (FAIL)
 
------- 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;"FAIL cannot route this one (FAIL)"@some.host
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaX-0005vi-00
-	for "FAIL cannot route this one (FAIL)"@some.host; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+	id 10HmaX-000000005vi-0000
+	for "FAIL cannot route this one (FAIL)"@some.host;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--
+