X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..86e280ca236af22136ad21cc8da30ed82afb0a02:/test/mail/0395.userx

diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index a8f10e53e..488b4a62e 100644
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -1,95 +1,107 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaY-0005vi-00
-	for userx@origin.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 userx@origin.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: philip
 To: userx
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00
-	for userx@origin.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 userx@origin.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@origin.ex
 To: userx@test.ex
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
+	id 10HmbA-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@test.ex
 To: userx@test.ex
+Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbB-0005vi-00
-	for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+	id 10HmbB-000000005vi-0000
+	for userx@origin.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: philip
 To: userx
+Message-Id: <E10HmbB-000000005vi-0000@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
+	id 10HmbC-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx
 To: userx
+Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
+	id 10HmbD-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@test.ex
 To: userx@test.ex
+Message-Id: <E10HmbD-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
+	id 10HmbE-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx
 To: userx
+Message-Id: <E10HmbE-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+	by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
+	id 10HmbF-000000005vi-0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@test.ex
 To: userx@test.ex
+Message-Id: <E10HmbF-000000005vi-0000@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000