X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..600dc06981df5a906125f8442c36056a117412d4:/test/mail/0050.userx

diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index 706b3c3b7..69ad9983e 100644
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -4,12 +4,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
-	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.ex>
+	id 10HmaX-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaX-000000005vi-0000@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -19,12 +20,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
-	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
+	id 10HmaY-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaY-000000005vi-0000@myhost.ex>
 From: userx@outside.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 
@@ -34,12 +36,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
-	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
+	id 10HmaZ-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.ex>
 From: userx@outside.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 
@@ -49,12 +52,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@elsewhere.ex>)
-	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.ex>
+	id 10HmbA-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmbA-000000005vi-0000@myhost.ex>
 From: userx@elsewhere.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 
@@ -62,14 +66,16 @@ From userx@cus.cam.ac.uk Tue Mar 02 09:44:33 1999
 Return-path: <userx@cus.cam.ac.uk>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
-	id 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.ex>
+	id 10HmbB-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmbB-000000005vi-0000@myhost.ex>
 From: userx@cus.cam.ac.uk
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 5.
 
@@ -79,12 +85,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
-	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
+	id 10HmbC-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbC-000000005vi-0000@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 6.
 
@@ -94,12 +101,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
-	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.ex>
+	id 10HmbD-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbD-000000005vi-0000@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 7.
 
@@ -109,11 +117,12 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
-	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
+	id 10HmbE-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@some.where>
+Message-Id: <E10HmbE-000000005vi-0000@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 8.
 
@@ -123,12 +132,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
-	id 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.ex>
+	id 10HmbF-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbF-000000005vi-0000@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 9.
 
@@ -138,12 +148,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@elsewhere.ex>)
-	id 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
+	id 10HmbG-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbG-000000005vi-0000@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 10.
 
@@ -151,14 +162,16 @@ From userx@somehost.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <userx@somehost.test.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <userx@somehost.test.ex>)
-	id 10HmbH-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@myhost.ex>
+	id 10HmbH-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbH-000000005vi-0000@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 11.