X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/mail/0220.userx?ds=sidebyside

diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 02060801b..49a77d537 100644
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -1,54 +1,60 @@
 From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <foo@bar>)
-	id 10HmaY-0005vi-00
-	for userx@myhost.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.test.ex>
+	id 10HmaY-000000005vi-0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <foo@bar>)
-	id 10HmaZ-0005vi-00
-	for userx@myhost.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.test.ex>
+	id 10HmaZ-000000005vi-0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <foo@bar>)
-	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.test.ex>
+	id 10HmbA-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <foo@bar>)
-	id 10HmbB-0005vi-00
-	for userx@myhost.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.test.ex>
+	id 10HmbB-000000005vi-0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: foobydooby <foo@bar>
+Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbF-0005vi-00
-	for userx@myhost.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.test.ex>
+	id 10HmbF-000000005vi-0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000