X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..af8a610f0b90ae66f32b7c6ec31381bdd8457b59:/test/mail/0140.CALLER

diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index 468c76fc5..bc9dd2a82 100644
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -3,15 +3,16 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+	id 10HmaY-000000005vi-0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: Reply Person <CALLER@test.ex>
-In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
-References: <E10HmaX-0005vi-00@the.local.host.name>
+In-Reply-To: <E10HmaX-000000005vi-0000@the.local.host.name>
+References: <E10HmaX-000000005vi-0000@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message; non-printer ><
 this is another line
@@ -21,15 +22,22 @@ Return-path: <>
 Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
-	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+	id 10HmbA-000000005vi-0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: reply2@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-000000005vi-0000@the.local.host.name>
+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: <E10HmbA-000000005vi-0000@the.local.host.name>
+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.
 
@@ -38,16 +46,29 @@ recipients. This is a permanent error. The following address(es) failed:
 
   reply2@test.ex
 
------- This is a copy of the message, including all the headers. ------
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/delivery-status
+
+Reporting-MTA: dns; the.local.host.name
+
+Action: failed
+Final-Recipient: rfc822;reply2@test.ex
+Status: 5.0.0
+
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM
+Content-type: message/rfc822
 
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00
-	for reply2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+	id 10HmaZ-000000005vi-0000
+	for reply2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message; non-printer ><
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
 
+--NNNNNNNNNN-eximdsn-MMMMMMMMMM--