Correct header sorting for testsuite. Required manual patching, so maybe errors. Fixes: #919

424 files changed, 1361 insertions, 1361 deletions

diff --git a/test/log/5100 b/test/log/5100
index ec4a807ff..e11d37c00 100644
--- a/test/log/5100
+++ b/test/log/5100
@@ -72,10 +72,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<< 	(envelope-from <CALLER@myhost.test.ex>)
 <<< 	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< script: 05
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+<<< script: 05
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
@@ -129,10 +129,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<< 	(envelope-from <CALLER@myhost.test.ex>)
 <<< 	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< script: 06
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+<<< script: 06
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
@@ -202,10 +202,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<< 	(envelope-from <CALLER@myhost.test.ex>)
 <<< 	id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< script: 08
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+<<< script: 08
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
@@ -240,10 +240,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<< 	(envelope-from <CALLER@myhost.test.ex>)
 <<< 	id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< script: 09
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+<<< script: 09
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
diff --git a/test/log/5101 b/test/log/5101
index 5820439f5..c0c3856b3 100644
--- a/test/log/5101
+++ b/test/log/5101
@@ -23,10 +23,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<< 	(envelope-from <CALLER@myhost.test.ex>)
 <<< 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< mailbox: copied
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+<<< mailbox: copied
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< Here's a new line.
@@ -69,9 +69,9 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<< 	(envelope-from <CALLER@myhost.test.ex>)
 <<< 	id 10HmaZ-0005vi-00; 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>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is another test message.
 <<< Here's a new line.
diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index 1b73cc347..0d795f636 100644
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <someone@some.domain>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00.a-b-c-@some.domain>
 From: someone@some.domain
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
@@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <someone@some.domain>)
 	id 10HmaY-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: second
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>
+Subject: second
 From: someone@some.domain
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
@@ -47,11 +47,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <someone@some.domain>)
 	id 10HmaZ-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>
 Subject: third
 Reply-to: some@body
-Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>
 From: someone@some.domain
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
diff --git a/test/mail/0006.CALLER b/test/mail/0006.CALLER
index 627bc16bc..162bcd059 100644
--- a/test/mail/0006.CALLER
+++ b/test/mail/0006.CALLER
@@ -5,11 +5,11 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <someone@some.where>)
 	id 10HmaZ-0005vi-00; 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>
 From:<someone@some.where>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message Headers:
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
diff --git a/test/mail/0008.CALLER b/test/mail/0008.CALLER
index 0a54f1f4d..15ccf08ca 100644
--- a/test/mail/0008.CALLER
+++ b/test/mail/0008.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <someone@some.where>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
 Message-id: abcd%rxyz@p.q.r
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot
diff --git a/test/mail/0009.CALLER b/test/mail/0009.CALLER
index b4806a18d..c6bc2c961 100644
--- a/test/mail/0009.CALLER
+++ b/test/mail/0009.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <someone@some.where>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot
diff --git a/test/mail/0010.CALLER b/test/mail/0010.CALLER
index b4806a18d..c6bc2c961 100644
--- a/test/mail/0010.CALLER
+++ b/test/mail/0010.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <someone@some.where>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot
diff --git a/test/mail/0011.CALLER b/test/mail/0011.CALLER
index b4806a18d..c6bc2c961 100644
--- a/test/mail/0011.CALLER
+++ b/test/mail/0011.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <someone@some.where>)
 	id 10HmaX-0005vi-00
 	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot
diff --git a/test/mail/0014.userx b/test/mail/0014.userx
index 8844387dc..956382bd3 100644
--- a/test/mail/0014.userx
+++ b/test/mail/0014.userx
@@ -3,21 +3,21 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: aaa@bbb
 To: userx@myhost.test.ex, 1=x@zzery.query
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From J.Caesar@plc.example Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <J.Caesar@plc.example>)
 	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>
 From: J.Caesar@plc.example
 To: userx@myhost.test.ex, J.Caesar@plc.example,
   J.Calendar@plc.example,
   unknown@plc.example 
 Reply-to: J.Caesar@plc.example   
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index 2f531e675..f617ace68 100644
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-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: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: CALLER
 X-local_part_prefix: 
 
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for page+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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -43,13 +43,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@the.local.host.name>
 X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: CALLER
 X-local_part_prefix: 
 
@@ -69,9 +69,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for page+ux@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some more message text.
 
diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 29b1e9a95..2112b7100 100644
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for page+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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: page+
 
@@ -21,13 +21,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	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@the.local.host.name>
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
 
@@ -41,9 +41,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for page+ux@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: page+
 
@@ -56,13 +56,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	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@the.local.host.name>
 To: userx@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
 
@@ -78,9 +78,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for B+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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: b+
 
@@ -95,9 +95,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
 
@@ -111,9 +111,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: x+
 
diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 8e33c3631..3f0451c3c 100644
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx+page@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -19,13 +19,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	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@the.local.host.name>
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 callpager -r 108 PAGE:Some message text. 
 
diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 213d0c60a..e29b12832 100644
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
 	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.test.ex>
 From: ok@test2
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3.
 
@@ -30,12 +30,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbG-0005vi-00
 	for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
 	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.test.ex>
 From: ok@test4
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 5.
 
diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index 2abd8d315..b8b130f76 100644
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	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.test.ex>
 From: userx@test1
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1.
 
@@ -31,9 +31,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test1>)
 	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.test.ex>
 From: ok@test1
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 2.
 
@@ -42,9 +42,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test3>)
 	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.test.ex>
 From: ok@test3
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 4.
 
@@ -52,12 +52,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbI-0005vi-00
 	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -68,12 +68,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbJ-0005vi-00
 	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -87,8 +87,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	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.test.ex>
 From: userx@test1
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index 791683ab7..791a3266a 100644
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 4c7822197..c9a8874b4 100644
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	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.test.ex>
 From: x@y
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Message 7
@@ -15,11 +15,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	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.test.ex>
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: x@y
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Message 10
@@ -28,11 +28,11 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	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.test.ex>
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Message 11
diff --git a/test/mail/0031.CALLER b/test/mail/0031.CALLER
index d996dc047..ef8774a37 100644
--- a/test/mail/0031.CALLER
+++ b/test/mail/0031.CALLER
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
 	for CALLER@one.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 95051c4d9..2c3c866be 100644
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@some.where>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
 	for userx@mxt1.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0036.abcd b/test/mail/0036.abcd
index 1c9503859..63fc8aad9 100644
--- a/test/mail/0036.abcd
+++ b/test/mail/0036.abcd
@@ -6,10 +6,10 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=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; Tue, 2 Mar 1999 09:44:33 +0000
-To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/0036.userx b/test/mail/0036.userx
index 1c9503859..63fc8aad9 100644
--- a/test/mail/0036.userx
+++ b/test/mail/0036.userx
@@ -6,10 +6,10 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=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; Tue, 2 Mar 1999 09:44:33 +0000
-To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 93711697d..d3aa4fbff 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -5,6 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-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: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: usery@test.ex,
   abcd@test.ex,
   userx@test.ex
@@ -12,8 +14,6 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -33,10 +33,10 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should fail this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Subject: should fail this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Fail this.
@@ -48,14 +48,14 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-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: <E10HmbD-0005vi-00@the.local.host.name>
 To: CALLER@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a text line
 
@@ -66,13 +66,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-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: <E10HmbF-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -89,10 +89,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for filter-pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (1)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Subject: should give filter error (1)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -103,13 +103,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-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: <E10HmbH-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-file@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -126,10 +126,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for filter-file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (2)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+Subject: should give filter error (2)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -140,13 +140,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbJ-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: <E10HmbJ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-lookup@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbJ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -163,10 +163,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-0005vi-00
 	for filter-lookup@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (3)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
+Subject: should give filter error (3)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -177,13 +177,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbL-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: <E10HmbL-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-exists@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -200,10 +200,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbK-0005vi-00
 	for filter-exists@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (4)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
+Subject: should give filter error (4)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -214,13 +214,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbN-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: <E10HmbN-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbN-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -237,10 +237,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbM-0005vi-00
 	for filter-readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (5)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
+Subject: should give filter error (5)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -251,13 +251,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbP-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: <E10HmbP-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-run@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbP-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -274,10 +274,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbO-0005vi-00
 	for filter-run@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (6)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
+Subject: should give filter error (6)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -288,14 +288,14 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbR-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: <E10HmbR-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 Subject: On vacation
 In-Reply-To: <E10HmbQ-0005vi-00@the.local.host.name>
 References: <E10HmbQ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbR-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 this is vacation text
 
@@ -306,13 +306,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbV-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: <E10HmbV-0005vi-00@the.local.host.name>
 X-Failed-Recipients: readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbV-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -329,9 +329,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbU-0005vi-00
 	for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Should fail ${readfile in filter.
@@ -343,13 +343,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmcB-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: <E10HmcB-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-stat@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmcB-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -366,10 +366,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmcA-0005vi-00
 	for filter-stat@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should give filter error (7)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmcA-0005vi-00@the.local.host.name>
+Subject: should give filter error (7)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -380,13 +380,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmcD-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: <E10HmcD-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 Subject: Re: Very long ... xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 In-Reply-To: <E10HmcC-0005vi-00@the.local.host.name>
 References: <E10HmcC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmcD-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0037.dff b/test/mail/0037.dff
index cf539f85e..a57f4833d 100644
--- a/test/mail/0037.dff
+++ b/test/mail/0037.dff
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbW-0005vi-00
 	for deliverfromfilter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbW-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 original_domain=test.ex
   original_local_part=system-filter
   parent_domain=test.ex
diff --git a/test/mail/0037.postmaster b/test/mail/0037.postmaster
index f7c2aea50..90b2408e4 100644
--- a/test/mail/0037.postmaster
+++ b/test/mail/0037.postmaster
@@ -5,12 +5,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-0005vi-00
 	for postmaster@test.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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbA-0005vi-00 has been frozen by the system filter.
 subject was "should freeze this" 
@@ -28,12 +28,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbT-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbT-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen
-Message-Id: <E10HmbT-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbS-0005vi-00 has been frozen by the system filter.
 subject was "should freeze this" 
diff --git a/test/mail/0037.userx b/test/mail/0037.userx
index 8a5e9a1b5..6243b66bb 100644
--- a/test/mail/0037.userx
+++ b/test/mail/0037.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: Test 1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: Test 1
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -21,10 +21,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: reply to this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Subject: reply to this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Reply to this.
@@ -37,10 +37,10 @@ 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
-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Subject: should freeze this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 X-added: qualify_domain is test.ex
 
@@ -54,10 +54,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbS-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
+Subject: should freeze this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 X-added: qualify_domain is test.ex
 
@@ -71,9 +71,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbX-0005vi-00
 	for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
diff --git a/test/mail/0037.userz b/test/mail/0037.userz
index ae2f0e01a..ec8423188 100644
--- a/test/mail/0037.userz
+++ b/test/mail/0037.userz
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: Test 1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: Test 1
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -20,10 +20,10 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should fail this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Subject: should fail this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Fail this.
@@ -36,10 +36,10 @@ 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
-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Subject: should freeze this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Freeze this.
@@ -52,10 +52,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: reply to this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Subject: reply to this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Reply to this.
@@ -68,10 +68,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbS-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
+Subject: should freeze this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Freeze this (second message).
@@ -84,9 +84,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbU-0005vi-00
 	for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Should fail ${readfile in filter.
@@ -99,10 +99,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: should defer this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbY-0005vi-00@the.local.host.name>
+Subject: should defer this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Defer this.
diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index 11101b61d..9050b95ee 100644
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -5,13 +5,13 @@ 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>
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -57,9 +57,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -72,9 +72,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -85,13 +85,13 @@ 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>
 X-Failed-Recipients: prefixed+pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -137,9 +137,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for prefixed+pipe@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -152,9 +152,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for prefixed+pipe@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -165,13 +165,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@the.local.host.name>
 X-Failed-Recipients: pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -217,9 +217,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for pipe-suffixed@test.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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -232,9 +232,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for pipe-suffixed@test.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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -245,13 +245,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbE-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: <E10HmbE-0005vi-00@the.local.host.name>
 X-Failed-Recipients: prefixed+pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -297,9 +297,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for prefixed+pipe-suffixed@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -312,9 +312,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for prefixed+pipe-suffixed@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -325,13 +325,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbG-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: <E10HmbG-0005vi-00@the.local.host.name>
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -377,9 +377,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00
 	for pipe@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -392,9 +392,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00
 	for pipe@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index c6e4b19f9..2028319ea 100644
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -6,9 +6,9 @@ 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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -34,9 +34,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -62,9 +62,9 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -76,10 +76,10 @@ 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
-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.ex>
+From: From person <from@some.where>
 Sender: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -91,10 +91,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbD-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.ex>
+From: From person <from@some.where>
 Sender: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -106,10 +106,10 @@ 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
-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@myhost.ex>
+From: From person <from@some.where>
 Sender: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -121,10 +121,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbF-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.ex>
+From: From person <from@some.where>
 Sender: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -136,10 +136,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbG-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@myhost.ex>
+From: From person <from@some.where>
 Sender: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index 4d209dcd1..706b3c3b7 100644
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -6,10 +6,10 @@ 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
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -21,10 +21,10 @@ 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
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: userx@outside.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 
@@ -36,10 +36,10 @@ 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
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: userx@outside.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 
@@ -51,10 +51,10 @@ 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
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: userx@elsewhere.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 
@@ -66,10 +66,10 @@ Received: from CALLER 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
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: userx@cus.cam.ac.uk
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 5.
 
@@ -81,10 +81,10 @@ 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 6.
 
@@ -96,10 +96,10 @@ 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbD-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 7.
 
@@ -111,9 +111,9 @@ 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
-From: From person <from@some.where>
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@myhost.ex>
+From: From person <from@some.where>
 
 This is a test message 8.
 
@@ -125,10 +125,10 @@ 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbF-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 9.
 
@@ -140,10 +140,10 @@ 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 10.
 
@@ -155,10 +155,10 @@ Received: from CALLER 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbH-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 11.
 
diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index 322a48d74..04882a83d 100644
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: userx@bad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaY-0005vi-00
 	for userx@bad.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 
@@ -41,13 +41,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmbB-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: userx@badbad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbB-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -64,9 +64,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
 	for userx@badbad.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 
@@ -77,13 +77,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: userx@domain4.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -100,9 +100,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbD-0005vi-00
 	for userx@domain4.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 5.
 
@@ -113,13 +113,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmbG-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: userx@domain2.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -136,9 +136,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbF-0005vi-00
 	for userx@domain2.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 6.
 
diff --git a/test/mail/0051.userx b/test/mail/0051.userx
index 7e0caa91c..e03511072 100644
--- a/test/mail/0051.userx
+++ b/test/mail/0051.userx
@@ -6,9 +6,9 @@ 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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbC-0005vi-00
 	for userx@domain1.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 
@@ -34,9 +34,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbH-0005vi-00
 	for userx@xx.domain5.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 7.
 
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbI-0005vi-00
 	for userx@domain6.yy.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 8.
 
diff --git a/test/mail/0052.!one b/test/mail/0052.!one
index 9e4c91494..b517d8a40 100644
--- a/test/mail/0052.!one
+++ b/test/mail/0052.!one
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
 	for !one@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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 
diff --git a/test/mail/0052.CALLER b/test/mail/0052.CALLER
index 7e0fb955d..6cd2cdefd 100644
--- a/test/mail/0052.CALLER
+++ b/test/mail/0052.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: xx99@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
 	for xx99@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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -41,13 +41,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: !two@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -64,9 +64,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbB-0005vi-00
 	for !two@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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 
diff --git a/test/mail/0052.yy99 b/test/mail/0052.yy99
index 1ebddcbe9..b79785c20 100644
--- a/test/mail/0052.yy99
+++ b/test/mail/0052.yy99
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaZ-0005vi-00
 	for yy99@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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 
diff --git a/test/mail/0055.userx b/test/mail/0055.userx
index d31bc4ab2..975e3db7e 100644
--- a/test/mail/0055.userx
+++ b/test/mail/0055.userx
@@ -6,8 +6,8 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
 	for userx@myhost.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>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0072.CALLER b/test/mail/0072.CALLER
index 5199f679a..7ea62885b 100644
--- a/test/mail/0072.CALLER
+++ b/test/mail/0072.CALLER
@@ -5,13 +5,13 @@ 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>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@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 >\n <
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-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: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
@@ -38,10 +38,10 @@ 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
-Subject: third message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Subject: third message
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This has return_message set.
 
@@ -52,13 +52,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-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: <E10HmbD-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
@@ -73,13 +73,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-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: <E10HmbF-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
@@ -89,10 +89,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: third message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Subject: third message
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -102,13 +102,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-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: <E10HmbH-0005vi-00@the.local.host.name>
 To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= <CALLER@test.ex>
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
 References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to Encoded from
 
diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 45eac6bfe..5b42d0548 100644
--- a/test/mail/0073.CALLER
+++ b/test/mail/0073.CALLER
@@ -5,13 +5,13 @@ 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>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-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: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index 667c73139..28c9f6a9e 100644
--- a/test/mail/0074.CALLER
+++ b/test/mail/0074.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER 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>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply to first message
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-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: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply to third message
 
diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index fb5be8ac1..637092558 100644
--- a/test/mail/0074.userx
+++ b/test/mail/0074.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: first message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: first message
 From: 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
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: second message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Subject: second message
 From: 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
@@ -34,10 +34,10 @@ 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
-Subject: third message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Subject: third message
 From: 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
@@ -48,11 +48,11 @@ Received: from CALLER by the.local.host.name with local (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>
 Subject: fourth message
 X-nltest: xxxx
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -61,13 +61,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-0005vi-00; 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>
 To: userx@test.ex,  abey seedy <abcd@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing, testing
 
@@ -79,12 +79,12 @@ Received: from CALLER by the.local.host.name with local (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>
 Subject: fifth message
 Reply-to: userx@test.ex,
   abcd@test.ex
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -93,13 +93,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-0005vi-00; 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>
 To: userx@test.ex,   abcd@test.ex
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 To reply-to
 
diff --git a/test/mail/0075.subdir/userx b/test/mail/0075.subdir/userx
index 40bcd43f7..b30566ab4 100644
--- a/test/mail/0075.subdir/userx
+++ b/test/mail/0075.subdir/userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: first message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: first message
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 7a5b5233c..a76777584 100644
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -33,10 +33,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-sysmail: yes
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+sysmail: yes
 From: postmaster@exim.test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing mail from system filter
 
@@ -47,13 +47,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for userx@exim.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>
 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER@exim.test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 testing testing
 
diff --git a/test/mail/0081.userx b/test/mail/0081.userx
index 4f0d895b0..417bb1ec3 100644
--- a/test/mail/0081.userx
+++ b/test/mail/0081.userx
@@ -6,6 +6,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@exim.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 X-one: This is the first text.
 To: userx@exim.test.ex
 X-one: This is the second text.
@@ -13,8 +15,6 @@ From: userx@exim.test.ex
 X-one: This is the third text.
 Subject: testing, testing
 X-one: This is the fourth text.
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the message body.
 
diff --git a/test/mail/0082.userx b/test/mail/0082.userx
index 171166279..4f81ce483 100644
--- a/test/mail/0082.userx
+++ b/test/mail/0082.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with testproto (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	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@the.local.host.name>
 from: me@the.local.host.name
 To: me@the.local.host.name
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Proto: testproto
 
 This is some text
diff --git a/test/mail/0083.userx b/test/mail/0083.userx
index 994175b68..3af56820c 100644
--- a/test/mail/0083.userx
+++ b/test/mail/0083.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	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@the.local.host.name>
 from: me@the.local.host.name
 To: me@the.local.host.name
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Proto: local-bsmtp
 
 This is some text
diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index 14156674a..c778822b7 100644
--- a/test/mail/0090.CALLER
+++ b/test/mail/0090.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is an autogenerated message.
 
diff --git a/test/mail/0095.userx b/test/mail/0095.userx
index bd5e61c81..238daeb36 100644
--- a/test/mail/0095.userx
+++ b/test/mail/0095.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -14,11 +14,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 quota: 0
 threshold: 10
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -27,11 +27,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 quota: 10K
 threshold: 900
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A test message
 
@@ -39,13 +39,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-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: <E10HmbA-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From : p@q
 Reply-To: a@b
 To: userx@myhost.test.ex
 Subject: Your mailbox
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Your mailbox has crossed the threshold
 
@@ -54,11 +54,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 quota: 2200
 threshold: 90%
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -66,13 +66,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>
 Reply-To: x@y
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userx@myhost.test.ex
 Subject: Your mailbox
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message is automatically created by mail delivery software (Exim).
 
@@ -84,9 +84,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-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: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -194,9 +194,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-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: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/test/mail/0095.userz b/test/mail/0095.userz
index f10b3ea30..2720b972d 100644
--- a/test/mail/0095.userz
+++ b/test/mail/0095.userz
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbG-0005vi-00
 	for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-threshold: 330
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+threshold: 330
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 
diff --git a/test/mail/0095.userz.bounce b/test/mail/0095.userz.bounce
index 840e40fd5..bf73931fe 100644
--- a/test/mail/0095.userz.bounce
+++ b/test/mail/0095.userz.bounce
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbH-0005vi-00
 	for userz@myhost.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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userz@myhost.test.ex
 Subject: Your mailbox
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 This message is automatically created by mail delivery software (Exim).
diff --git a/test/mail/0096.userx b/test/mail/0096.userx
index 1dadfc4ce..2cb54cc5b 100644
--- a/test/mail/0096.userx
+++ b/test/mail/0096.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: First message subject
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: First message subject
 From: 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
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-X-RBL-Warning: A faked up RBL header
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+X-RBL-Warning: A faked up RBL header
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: xxxx
 
 
diff --git a/test/mail/0097.userx b/test/mail/0097.userx
index 1c062a264..299a89e32 100644
--- a/test/mail/0097.userx
+++ b/test/mail/0097.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: First message subject
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: First message subject
 From: 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
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-X-RBL-Warning: A faked up RBL header
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+X-RBL-Warning: A faked up RBL header
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: by router
 Added: by transport
 
diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index 532931db0..ecf48dad0 100644
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -5,12 +5,12 @@ 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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
@@ -38,12 +38,12 @@ 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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
@@ -71,12 +71,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
@@ -104,12 +104,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbE-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: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaX-0005vi-00 delayed by 10 minutes
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 10 minutes
 warn_message_recipients = CALLER@test.ex
@@ -132,12 +132,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-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: <E10HmbF-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex
@@ -160,12 +160,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbG-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: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmbB-0005vi-00 delayed by 0 minutes
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex
@@ -185,12 +185,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-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: <E10HmbH-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmbD-0005vi-00 delayed by 0 minutes
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex
diff --git a/test/mail/0100.CALLER b/test/mail/0100.CALLER
index 49db745bf..fbfaf7da0 100644
--- a/test/mail/0100.CALLER
+++ b/test/mail/0100.CALLER
@@ -6,9 +6,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbK-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 . a line starting with a dot
diff --git a/test/mail/0100.userw b/test/mail/0100.userw
index 3906e41a9..15bffa91f 100644
--- a/test/mail/0100.userw
+++ b/test/mail/0100.userw
@@ -9,9 +9,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userw@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot
diff --git a/test/mail/0100.userx b/test/mail/0100.userx
index 1de79e03f..c00830065 100644
--- a/test/mail/0100.userx
+++ b/test/mail/0100.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 >From the deep abyss
@@ -26,9 +26,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -168,9 +168,9 @@ 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -310,9 +310,9 @@ Received: from CALLER by the.local.host.name with local (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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -452,9 +452,9 @@ Received: from CALLER by the.local.host.name with local (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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -468,9 +468,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for filter-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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 >From the deep abyss
@@ -489,9 +489,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbH-0005vi-00
 	for filter-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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -504,9 +504,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-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: <E10HmbI-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and being a single dot:
 .
@@ -516,9 +516,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbJ-0005vi-00
 	for mmdf-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbJ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Line consisting of four ^A characters
 



 
@@ -532,10 +532,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbL-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: From
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
+Subject: From
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 >From is the very first word of the message.
 >From starts the second line.
diff --git a/test/mail/0100.usery b/test/mail/0100.usery
index a7f470978..f79004b7a 100644
--- a/test/mail/0100.usery
+++ b/test/mail/0100.usery
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for usery@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 From the deep abyss
diff --git a/test/mail/0100.userz b/test/mail/0100.userz
index 41f2f9883..8d7d5afa5 100644
--- a/test/mail/0100.userz
+++ b/test/mail/0100.userz
@@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for userz@test.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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot
diff --git a/test/mail/0101.userx b/test/mail/0101.userx
index 4848398b4..a9bf95600 100644
--- a/test/mail/0101.userx
+++ b/test/mail/0101.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 >From the deep abyss
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -159,9 +159,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -298,9 +298,9 @@ Received: from CALLER by the.local.host.name with local (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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -437,9 +437,9 @@ Received: from CALLER by the.local.host.name with local (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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -453,9 +453,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for filter-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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 From the deep abyss
@@ -474,9 +474,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00
 	for filter-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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -486,9 +486,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and being a single dot:
 .
@@ -498,9 +498,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbH-0005vi-00
 	for mmdf-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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Line consisting of four ^A characters
 



 
@@ -511,10 +511,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: From
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
+Subject: From
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 >From is the very first word of the message.
 >From starts the second line.
diff --git a/test/mail/0101.userz b/test/mail/0101.userz
index a340c343f..81763e04a 100644
--- a/test/mail/0101.userz
+++ b/test/mail/0101.userz
@@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for userz@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot
diff --git a/test/mail/0102.batched b/test/mail/0102.batched
index 2160dc31c..acfab6b94 100644
--- a/test/mail/0102.batched
+++ b/test/mail/0102.batched
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for batch-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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test to batch-userx
 .
@@ -18,9 +18,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbH-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test to batch-userx and batch-usery
 .
diff --git a/test/mail/0102.userx b/test/mail/0102.userx
index 2b5ed9885..2131c6497 100644
--- a/test/mail/0102.userx
+++ b/test/mail/0102.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Initial test message, no prefix.
 
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 
diff --git a/test/mail/0102.usery b/test/mail/0102.usery
index b3cca92ca..0e4d34cf1 100644
--- a/test/mail/0102.usery
+++ b/test/mail/0102.usery
@@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for bsmtp_usery@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message with bsmtp_ prefix
 .
@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for usery@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 .
diff --git a/test/mail/0102.userz b/test/mail/0102.userz
index 2a8c4ad7f..c32c363cf 100644
--- a/test/mail/0102.userz
+++ b/test/mail/0102.userz
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for mmdf_userz@test.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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message with mmdf_ prefix
 




@@ -14,9 +14,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userz@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 




@@ -25,9 +25,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for userz@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 




diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index f8ac3c475..ba79910f9 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-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: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: WASabc@x.y.zWAS
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -26,9 +26,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for "abc@x.y.z"@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message sent to "abc@x.y.z"@test.ex.
 
@@ -36,13 +36,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-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: <E10HmbD-0005vi-00@the.local.host.name>
 X-Failed-Recipients: ":fail: fail message"@special
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -59,9 +59,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for ":fail: fail message"@special; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message sent to ":fail: fail message"@special
 
diff --git a/test/mail/0103.rewritten b/test/mail/0103.rewritten
index c01a105ab..17b6118eb 100644
--- a/test/mail/0103.rewritten
+++ b/test/mail/0103.rewritten
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for "xyz@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message sent to "xyz@x.y.z"@test.ex.
 
diff --git a/test/mail/0104.mmm b/test/mail/0104.mmm
index bc9255776..44da90838 100644
--- a/test/mail/0104.mmm
+++ b/test/mail/0104.mmm
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for mmm@ten-1; Tue, 2 Mar 1999 09:44:33 +0000
-To: You <mmm@ten-1.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+To: You <mmm@ten-1.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0104.yyy b/test/mail/0104.yyy
index 4096709e3..3aa7b0dd6 100644
--- a/test/mail/0104.yyy
+++ b/test/mail/0104.yyy
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for yyy@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: comment <yyy@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+To: comment <yyy@test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0105.default b/test/mail/0105.default
index d6218632d..378448212 100644
--- a/test/mail/0105.default
+++ b/test/mail/0105.default
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for postmaster@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Delivered to default
 
diff --git a/test/mail/0105.firstuser b/test/mail/0105.firstuser
index 98088c7d9..73c535b1e 100644
--- a/test/mail/0105.firstuser
+++ b/test/mail/0105.firstuser
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for firstuser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Delivered to firstuser
 
diff --git a/test/mail/0105.seconduser b/test/mail/0105.seconduser
index 90f98df37..36a2d316f 100644
--- a/test/mail/0105.seconduser
+++ b/test/mail/0105.seconduser
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for seconduser@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Delivered to seconduser
 
diff --git a/test/mail/0110.second b/test/mail/0110.second
index 3f228bef7..b9b03a45f 100644
--- a/test/mail/0110.second
+++ b/test/mail/0110.second
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0111.userx b/test/mail/0111.userx
index 9f535da71..52e400758 100644
--- a/test/mail/0111.userx
+++ b/test/mail/0111.userx
@@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Forward: userx
 X-Alias: philip
 
@@ -17,9 +17,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for Philip@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Alias: philip
 X-Forward: userx
 
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for philip@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Alias: philip
 X-Forward: userx
 
diff --git a/test/mail/0112.file b/test/mail/0112.file
index 7bc02a7a6..73574e98d 100644
--- a/test/mail/0112.file
+++ b/test/mail/0112.file
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for file@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to file.
 
diff --git a/test/mail/0112.pipe b/test/mail/0112.pipe
index 3f86bc8ae..70591d67c 100644
--- a/test/mail/0112.pipe
+++ b/test/mail/0112.pipe
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to pipe.
 
diff --git a/test/mail/0113.second b/test/mail/0113.second
index 3f228bef7..b9b03a45f 100644
--- a/test/mail/0113.second
+++ b/test/mail/0113.second
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0114.file b/test/mail/0114.file
index a04c45d00..ebd205b1b 100644
--- a/test/mail/0114.file
+++ b/test/mail/0114.file
@@ -3,23 +3,23 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for file@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to file.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00; 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>
 To: A. File <file@test.ex>, No One <null@test.ex>
 Subject: autoreply
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test Text
 
diff --git a/test/mail/0114.pipe b/test/mail/0114.pipe
index 3f86bc8ae..70591d67c 100644
--- a/test/mail/0114.pipe
+++ b/test/mail/0114.pipe
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to pipe.
 
diff --git a/test/mail/0115.file b/test/mail/0115.file
index cce750388..021c3cd7a 100644
--- a/test/mail/0115.file
+++ b/test/mail/0115.file
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: 
 
 Message to userx.
@@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for one-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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: TESTSUITE/aux-fixed
 
 Message to one-userx.
@@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for two-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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: /tmp
 
 Message to two-userx.
@@ -39,9 +39,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for three-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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: 
 
 Message to three-userx.
diff --git a/test/mail/0116.acopy b/test/mail/0116.acopy
index e9c3e763e..a07b9fee5 100644
--- a/test/mail/0116.acopy
+++ b/test/mail/0116.acopy
@@ -2,9 +2,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copyalias
 
 Message sent to acopy.
diff --git a/test/mail/0116.alias1 b/test/mail/0116.alias1
index e9c3e763e..a07b9fee5 100644
--- a/test/mail/0116.alias1
+++ b/test/mail/0116.alias1
@@ -2,9 +2,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copyalias
 
 Message sent to acopy.
diff --git a/test/mail/0116.alias2 b/test/mail/0116.alias2
index e9c3e763e..a07b9fee5 100644
--- a/test/mail/0116.alias2
+++ b/test/mail/0116.alias2
@@ -2,9 +2,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copyalias
 
 Message sent to acopy.
diff --git a/test/mail/0116.dcopy b/test/mail/0116.dcopy
index d53ee0bea..4899c4d22 100644
--- a/test/mail/0116.dcopy
+++ b/test/mail/0116.dcopy
@@ -2,9 +2,9 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copydeliver
 
 Message sent to dcopy.
@@ -13,9 +13,9 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copydeliver
 
 Message sent to dcopy.
diff --git a/test/mail/0118.userx b/test/mail/0118.userx
index e3b863543..697244059 100644
--- a/test/mail/0118.userx
+++ b/test/mail/0118.userx
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0127.userx b/test/mail/0127.userx
index 364abefad..28b1f3150 100644
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -6,10 +6,10 @@ 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
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -21,10 +21,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -36,10 +36,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -51,10 +51,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -66,10 +66,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbB-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
+Sender: Sender in original <sender@original.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -81,10 +81,10 @@ 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -96,10 +96,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbD-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -111,10 +111,10 @@ 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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -126,10 +126,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbF-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -141,10 +141,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.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>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0131.copy b/test/mail/0131.copy
index 798a7af6e..66daee4b0 100644
--- a/test/mail/0131.copy
+++ b/test/mail/0131.copy
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: >-islocal-forward-forward-local<
 
 Test message
diff --git a/test/mail/0131.userx b/test/mail/0131.userx
index 85a3958ce..94f4a9ba9 100644
--- a/test/mail/0131.userx
+++ b/test/mail/0131.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: >-islocal-forward-islocal-local<
 
 Test message
diff --git a/test/mail/0133.dddd b/test/mail/0133.dddd
index 98c203b70..e71139135 100644
--- a/test/mail/0133.dddd
+++ b/test/mail/0133.dddd
@@ -3,9 +3,9 @@ Envelope-to: userx@a.test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Final: dddd@a.test.ex
 
 Test message
@@ -15,9 +15,9 @@ Envelope-to: usery@b.test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Final: dddd@test.ex
 
 Test message
diff --git a/test/mail/0134.UC-USERX b/test/mail/0134.UC-USERX
index 78e8ca8ee..4273d8261 100644
--- a/test/mail/0134.UC-USERX
+++ b/test/mail/0134.UC-USERX
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for USERX@KNOWN.DOMAIN; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 domainlist: dd=data for known.domain lpd=data for userx
 domain_data: data for known.domain
 local_part_data: data for userx
diff --git a/test/mail/0134.lc-unknown b/test/mail/0134.lc-unknown
index 4495f885d..21d2c808f 100644
--- a/test/mail/0134.lc-unknown
+++ b/test/mail/0134.lc-unknown
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 router: defaulted
 domain_data: 
 local_part_data: 
@@ -16,9 +16,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 router: defaulted
 domain_data: 
 local_part_data: 
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for UNKNOWN@KNOWN.DOMAIN; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 domain_data: 
 local_part_data: 
 
diff --git a/test/mail/0134.lc-userx b/test/mail/0134.lc-userx
index 0d8a3c837..c1c6fa19b 100644
--- a/test/mail/0134.lc-userx
+++ b/test/mail/0134.lc-userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@unknown.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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 router: defaulted
 domain_data: 
 local_part_data: 
@@ -16,9 +16,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 smartuser: dd=data for test.ex lpd=data for userx
 domain_data: data for test.ex
 local_part_data: data for userx
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for userx@unknown.domain; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 domain_data: 
 local_part_data: 
 
@@ -43,9 +43,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for userx@known.domain; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 domainlist: dd=data for known.domain lpd=data for userx
 domain_data: data for known.domain
 local_part_data: data for userx
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 9d74ba75e..6df0a082e 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for forwarder@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>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
 Subject: Mail delivery failed
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -29,9 +29,9 @@ Return-path: <abcd@x.y.z>
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <abcd@x.y.z>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: abcd@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message.
 
@@ -39,13 +39,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for forwarder@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>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
 Subject: Mail delivery failed
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -66,8 +66,8 @@ Return-path: <abcd@x.y.z>
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <abcd@x.y.z>)
 	id 10HmbA-0005vi-00; 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>
 From: abcd@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0137.userx b/test/mail/0137.userx
index 7dd068d10..7b7147c95 100644
--- a/test/mail/0137.userx
+++ b/test/mail/0137.userx
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Transport: local_delivery
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Transport: local_delivery
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 First message.
 
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Transport: local_delivery
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Transport: local_delivery
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second message
 
@@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Transport: local_delivery_fcntl
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Transport: local_delivery_fcntl
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Third message
 
@@ -39,10 +39,10 @@ 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
-Transport: local_delivery_fcntl_blocking
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Transport: local_delivery_fcntl_blocking
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Fourth message
 
diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index e7882aa43..468c76fc5 100644
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -5,13 +5,13 @@ 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>
 To: Reply Person <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@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
@@ -23,13 +23,13 @@ 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>
 X-Failed-Recipients: reply2@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -45,9 +45,9 @@ 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
-Subject: first message; non-printer ><
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Subject: first message; non-printer ><
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER
index a7d97c7a7..7a937b1dc 100644
--- a/test/mail/0142.CALLER
+++ b/test/mail/0142.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -32,9 +32,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/0142.filter b/test/mail/0142.filter
index 7dca98165..3ecd4b929 100644
--- a/test/mail/0142.filter
+++ b/test/mail/0142.filter
@@ -2,9 +2,9 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 max fd = dddd
diff --git a/test/mail/0150.postmaster b/test/mail/0150.postmaster
index eb51b1c2f..a0f66f537 100644
--- a/test/mail/0150.postmaster
+++ b/test/mail/0150.postmaster
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: not.the.login@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: not.the.login@test.ex
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/0151.postmaster b/test/mail/0151.postmaster
index 58f860c6d..d3454fa19 100644
--- a/test/mail/0151.postmaster
+++ b/test/mail/0151.postmaster
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: not.the.login@test.ex
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: not.the.login@test.ex
 
 Test message
 
diff --git a/test/mail/0152.postmaster b/test/mail/0152.postmaster
index 2e2315621..5facda3d2 100644
--- a/test/mail/0152.postmaster
+++ b/test/mail/0152.postmaster
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: not.the.login@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: not.the.login@test.ex
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: page+CALLER@test.ex
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: page+CALLER@test.ex
 
 Test message
 
@@ -26,10 +26,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: call+CALLER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+From: call+CALLER@test.ex
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -38,9 +38,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: call-CALLER@test.ex
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+From: call-CALLER@test.ex
 
 Test message
 
@@ -49,9 +49,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: CALLER&page@test.ex
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+From: CALLER&page@test.ex
 
 Test message
 
@@ -60,10 +60,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: CALLER&call@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+From: CALLER&call@test.ex
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -72,9 +72,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: CALLER=call@test.ex
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+From: CALLER=call@test.ex
 
 Test message
 
@@ -83,9 +83,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: page+CALLER=call@test.ex
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+From: page+CALLER=call@test.ex
 
 Test message
 
diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 208c76272..ce3f8be09 100644
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -55,9 +55,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -69,22 +69,22 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -130,9 +130,9 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -143,8 +143,8 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 4ede20de7..1f8c3fac7 100644
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -55,9 +55,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -69,22 +69,22 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -132,9 +132,9 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -145,8 +145,8 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0166.userx b/test/mail/0166.userx
index 3c58c0da1..44c5b43b7 100644
--- a/test/mail/0166.userx
+++ b/test/mail/0166.userx
@@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Delivered-To: a@test.ex
 X-Delivered-To: b@test.ex
 X-Delivered-To: c@test.ex
diff --git a/test/mail/0166.usery b/test/mail/0166.usery
index 529767368..b902efb37 100644
--- a/test/mail/0166.usery
+++ b/test/mail/0166.usery
@@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Delivered-To: a@test.ex
 X-Delivered-To: bb@test.ex
 X-Delivered-To: e@test.ex
diff --git a/test/mail/0167.userx b/test/mail/0167.userx
index c5ac0af4a..f1d32cb83 100644
--- a/test/mail/0167.userx
+++ b/test/mail/0167.userx
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -16,9 +16,9 @@ Envelope-to: userx@test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	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@the.local.host.name>
 From: remove@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -28,8 +28,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <trakill@test.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@the.local.host.name>
 From: trakill@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0169.userx b/test/mail/0169.userx
index 34ff7fcd0..6642d482e 100644
--- a/test/mail/0169.userx
+++ b/test/mail/0169.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -14,11 +14,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 quota: 0
 threshold: 10
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -27,11 +27,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-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: <E10HmbA-0005vi-00@myhost.test.ex>
 quota: 50M
 threshold: 41%
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test
 
diff --git a/test/mail/0171.CALLER b/test/mail/0171.CALLER
index 74a65676a..e053d52eb 100644
--- a/test/mail/0171.CALLER
+++ b/test/mail/0171.CALLER
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 home: HOME=CALLER_HOME
 
 
diff --git a/test/mail/0173.userx b/test/mail/0173.userx
index e5448334c..3178cb1ff 100644
--- a/test/mail/0173.userx
+++ b/test/mail/0173.userx
@@ -7,9 +7,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -21,9 +21,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
diff --git a/test/mail/0173.usery b/test/mail/0173.usery
index f7da5ec65..00d5a68dc 100644
--- a/test/mail/0173.usery
+++ b/test/mail/0173.usery
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
diff --git a/test/mail/0173.userz b/test/mail/0173.userz
index f7da5ec65..00d5a68dc 100644
--- a/test/mail/0173.userz
+++ b/test/mail/0173.userz
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index a20d75abf..faaa4bcaa 100644
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-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: <E10HmbD-0005vi-00@the.local.host.name>
 X-Failed-Recipients: userx@non-local.example
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Yet another test message
 
diff --git a/test/mail/0174.userx b/test/mail/0174.userx
index 8ef0afb6c..a80da164d 100644
--- a/test/mail/0174.userx
+++ b/test/mail/0174.userx
@@ -7,9 +7,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
@@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Yet another test message
 
diff --git a/test/mail/0174.usery b/test/mail/0174.usery
index e4bfa8a1e..6f5f5b4b3 100644
--- a/test/mail/0174.usery
+++ b/test/mail/0174.usery
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
diff --git a/test/mail/0174.userz b/test/mail/0174.userz
index e4bfa8a1e..6f5f5b4b3 100644
--- a/test/mail/0174.userz
+++ b/test/mail/0174.userz
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER
index 0b5a23597..292f12db6 100644
--- a/test/mail/0176.CALLER
+++ b/test/mail/0176.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: someone@somewhere
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for someone@somewhere; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message or other.
 
diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index b40823a03..caba89649 100644
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-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: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,10 +25,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: fail this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: fail this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be failed.
 
diff --git a/test/mail/0177.userx b/test/mail/0177.userx
index b1c66701f..fceff433e 100644
--- a/test/mail/0177.userx
+++ b/test/mail/0177.userx
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: reply to this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Subject: reply to this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be replied to.
 
@@ -15,10 +15,10 @@ 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
-Subject: freeze this (1)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Subject: freeze this (1)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be frozen.
 
@@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: freeze this (2)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Subject: freeze this (2)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a second message to be frozen.
 
diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 2fc9e36ea..999c0a5c2 100644
--- a/test/mail/0177.usery
+++ b/test/mail/0177.usery
@@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for usery@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>
 To: usery@test.ex
 Subject: auto fail message
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 failing userx@test.ex
 
@@ -17,14 +17,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-0005vi-00
 	for usery@test.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>
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 freezing userx@test.ex
 
@@ -32,14 +32,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-0005vi-00
 	for usery@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>
 To: usery@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a text line
 
@@ -47,14 +47,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-0005vi-00
 	for usery@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>
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 freezing userx@test.ex
 
@@ -62,14 +62,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-0005vi-00
 	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
 References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 freezing userz@test.ex
 
diff --git a/test/mail/0182.userx b/test/mail/0182.userx
index 3c666c667..b778e7efb 100644
--- a/test/mail/0182.userx
+++ b/test/mail/0182.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Added: by system filter
 X-Added: by system filter
 
diff --git a/test/mail/0189.userx b/test/mail/0189.userx
index eda035d5b..1e391afc4 100644
--- a/test/mail/0189.userx
+++ b/test/mail/0189.userx
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message from an untrusted caller.
 
@@ -18,10 +18,10 @@ Received: from root by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <root@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Sender: sender@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Sender: sender@some.domain
 From: CALLER_NAME <root@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message from a trusted caller....
 
diff --git a/test/mail/0192.userx b/test/mail/0192.userx
index a55a9bb85..9cf0b1bca 100644
--- a/test/mail/0192.userx
+++ b/test/mail/0192.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message which should get delivered.
 
@@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 From: =?ISO-8859-1?Q?M=E8=E9_spaces=3A_funny=2C_char=5Facters?= <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message which should go over the threshold, but still
 be delivered.
diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER
index 0a28b3f0e..016cbc71d 100644
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -2,6 +2,8 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex
@@ -9,8 +11,6 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -35,9 +35,9 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -45,6 +45,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: seven@myhost.test.ex,
   six@myhost.test.ex,
   five@myhost.test.ex,
@@ -56,8 +58,6 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -96,9 +96,9 @@ 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 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here's another message.
 
@@ -106,6 +106,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbD-0005vi-00
 	for CALLER@myhost.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.test.ex>
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex
@@ -113,8 +115,6 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -142,10 +142,10 @@ 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 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-ret: 99
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+ret: 99
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 More message 99
 
diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 49eeb21f2..45966b188 100644
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -5,9 +5,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test one.
 .
@@ -18,9 +18,9 @@ DATA
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <doesn't@matter>)
 	id 10HmaY-0005vi-00; 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>
 From: doesn't@matter
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test two.
 .
diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index b3d6cfeae..68774bb98 100644
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 .: this is legal
 From: me@test.ex
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 This line follows ..
@@ -17,10 +17,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: me@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: me@test.ex
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 This line follows ..
@@ -30,11 +30,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: me@test.ex
 ..: this really is legal
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .. two dots
 .
@@ -45,11 +45,11 @@ 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>
 From: me@test.ex
 ..: this really is legal
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .. two dots
 .
diff --git a/test/mail/0205.redirected b/test/mail/0205.redirected
index 889ceb26d..6b9a415ed 100644
--- a/test/mail/0205.redirected
+++ b/test/mail/0205.redirected
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for redirect@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: >-redirect<
 
 
diff --git a/test/mail/0205.x b/test/mail/0205.x
index cabaaf1cb..622cba77f 100644
--- a/test/mail/0205.x
+++ b/test/mail/0205.x
@@ -2,9 +2,9 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: ><
 
 
diff --git a/test/mail/0210.file b/test/mail/0210.file
index feb122504..efe155e6b 100644
--- a/test/mail/0210.file
+++ b/test/mail/0210.file
@@ -7,9 +7,9 @@ Envelope-to: file@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
diff --git a/test/mail/0210.pipe b/test/mail/0210.pipe
index 4d976d64d..bcb247317 100644
--- a/test/mail/0210.pipe
+++ b/test/mail/0210.pipe
@@ -6,9 +6,9 @@ Envelope-to: pipe@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index cd5f25b1a..29a0e32b1 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -3,13 +3,13 @@ Return-path: <>
 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>
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1
 
@@ -38,14 +38,14 @@ Return-path: <>
 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>
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -65,9 +65,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 2
 
diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 0eadbaa41..02060801b 100644
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -3,10 +3,10 @@ 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>
 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
@@ -14,10 +14,10 @@ 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>
 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
@@ -25,10 +25,10 @@ Received: from CALLER 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>
 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
@@ -36,10 +36,10 @@ 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
-From: foobydooby <foo@bar>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+From: foobydooby <foo@bar>
 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
@@ -47,8 +47,8 @@ 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0221.userx b/test/mail/0221.userx
index b13a7d7a0..eed7e8ead 100644
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 From: 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
@@ -13,9 +13,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 From: 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
@@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: 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
@@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: foobydooby <foo@bar>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+From: foobydooby <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1
index 6db0b20c3..0342bd97c 100644
--- a/test/mail/0222.foo1
+++ b/test/mail/0222.foo1
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for foo1@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>
 To: foo1@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 
@@ -16,13 +16,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbH-0005vi-00
 	for foo1@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.test.ex>
 To: foo1@test.ex
 In-Reply-To: <E10HmbG-0005vi-00@myhost.test.ex>
 References: <E10HmbG-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 
diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index a932aa023..e48467d98 100644
--- a/test/mail/0222.foo2
+++ b/test/mail/0222.foo2
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbB-0005vi-00
 	for foo2@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>
 To: foo2@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@myhost.test.ex>
 References: <E10HmbA-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 
diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 574730524..99e58473f 100644
--- a/test/mail/0222.foo3
+++ b/test/mail/0222.foo3
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for foo3@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.test.ex>
 To: foo3@test.ex
 In-Reply-To: <E10HmbD-0005vi-00@myhost.test.ex>
 References: <E10HmbD-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 
diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 45eac6bfe..5b42d0548 100644
--- a/test/mail/0223.CALLER
+++ b/test/mail/0223.CALLER
@@ -5,13 +5,13 @@ 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>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-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: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index a2dea13eb..7ec707e8e 100644
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -5,13 +5,13 @@ 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>
 X-Failed-Recipients: bounce@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -30,10 +30,10 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: first message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: first message
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -43,20 +43,20 @@ 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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 The message identifier is:     10HmaZ-0005vi-00
-The subject of the message is: second message
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
+The subject of the message is: second message
 
 The addresses to which the message has not yet been delivered are:
 
diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index b2c29d123..2b3a998fa 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: |/p/q/r@no.test.ex,
   /a/b/c@no.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
@@ -37,13 +37,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@yes.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -88,9 +88,9 @@ USER=|TESTSUITE/aux-fixed/showenv
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
@@ -102,9 +102,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
diff --git a/test/mail/0226.file b/test/mail/0226.file
index 27c3caf48..79986490f 100644
--- a/test/mail/0226.file
+++ b/test/mail/0226.file
@@ -2,9 +2,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
diff --git a/test/mail/0231.a b/test/mail/0231.a
index e83069fae..aef741701 100644
--- a/test/mail/0231.a
+++ b/test/mail/0231.a
@@ -2,11 +2,11 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From:     a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 To:       a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 Reply-to: a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0231.b b/test/mail/0231.b
index ef29f5fea..02e9daa6e 100644
--- a/test/mail/0231.b
+++ b/test/mail/0231.b
@@ -2,11 +2,11 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From:     a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 To:       a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 Reply-to: a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0233.me b/test/mail/0233.me
index 1e9b1086c..edd32e886 100644
--- a/test/mail/0233.me
+++ b/test/mail/0233.me
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for me@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
 Subject: Message frozen
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmaX-0005vi-00 has been frozen by the system filter.
 system filter freezes.
@@ -20,12 +20,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for me@myhost.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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
 Subject: Message frozen on arrival
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbB-0005vi-00 was frozen on arrival by ACL.
 The sender is <CALLER@myhost.test.ex>.
@@ -34,12 +34,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for me@myhost.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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
 Subject: Message frozen on arrival
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbD-0005vi-00 was frozen on arrival by ACL.
 The sender is <CALLER@myhost.test.ex>.
diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster
index 6c0b1ff4e..84146dc36 100644
--- a/test/mail/0233.postmaster
+++ b/test/mail/0233.postmaster
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for postmaster@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>
 To: postmaster@myhost.test.ex
 Subject: System filter has frozen
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 700c73d7b..43cd1150b 100644
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,9 +25,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
@@ -35,12 +35,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -85,9 +85,9 @@ USER=|TESTSUITE/aux-fixed/showenv
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
@@ -99,9 +99,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
diff --git a/test/mail/0237.file b/test/mail/0237.file
index 27c3caf48..79986490f 100644
--- a/test/mail/0237.file
+++ b/test/mail/0237.file
@@ -2,9 +2,9 @@ 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; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
diff --git a/test/mail/0240.subdir/userx b/test/mail/0240.subdir/userx
index e3b863543..697244059 100644
--- a/test/mail/0240.subdir/userx
+++ b/test/mail/0240.subdir/userx
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0241.userx b/test/mail/0241.userx
index e3b863543..697244059 100644
--- a/test/mail/0241.userx
+++ b/test/mail/0241.userx
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0243.CALLER b/test/mail/0243.CALLER
index 11fc70884..1131d9c33 100644
--- a/test/mail/0243.CALLER
+++ b/test/mail/0243.CALLER
@@ -2,6 +2,8 @@ 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@nl.demon.net; 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>
 From: local.part@some.domain
 Reply-To: x@y, 
  p@q
@@ -10,8 +12,6 @@ Subject: Re:
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text of auto message. Expanded local_part is: faq.
 
diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER
index 8f9e5141b..2de9eaf2f 100644
--- a/test/mail/0246.CALLER
+++ b/test/mail/0246.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 To: CALLER_NAME <CALLER@myhost.test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 >>>>>>>>>>>>>>
 ${if exists{/source/exim4/AutoTest/aux/284.data}{${lookup{1}lsearch{/source/exim4/AutoTest/aux/284.data}{$value}{NOT FOUND}}}{NOT EXISTS}} 
diff --git a/test/mail/0252.t1 b/test/mail/0252.t1
index c81584d8b..e778583c4 100644
--- a/test/mail/0252.t1
+++ b/test/mail/0252.t1
@@ -4,9 +4,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <abc@x.y.z>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: abc@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <pqr@x.y.z>)
 	id 10HmaY-0005vi-00
 	for alias@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>
 From: pqr@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <gfh@x.y.z>)
 	id 10HmaZ-0005vi-00
 	for forward@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>
 From: gfh@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <mno@x.y.z>)
 	id 10HmbA-0005vi-00
 	for smart@myhost.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>
 From: mno@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/0252.t2 b/test/mail/0252.t2
index 557cf2780..519380d2a 100644
--- a/test/mail/0252.t2
+++ b/test/mail/0252.t2
@@ -4,9 +4,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <abc@x.y.z>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: abc@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <pqr@x.y.z>)
 	id 10HmaY-0005vi-00
 	for alias@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>
 From: pqr@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <gfh@x.y.z>)
 	id 10HmaZ-0005vi-00
 	for forward@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>
 From: gfh@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <mno@x.y.z>)
 	id 10HmbA-0005vi-00
 	for smart@myhost.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>
 From: mno@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index eeac8dc20..9b6ee4e69 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for lmn@myhost.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>
 X-Failed-Recipients: fail@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: lmn@myhost.test.ex
 Subject: Mail delivery failed
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -29,9 +29,9 @@ Return-path: <pqr@x.y.z>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <pqr@x.y.z>)
 	id 10HmaZ-0005vi-00; 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>
 From: pqr@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3
 
diff --git a/test/mail/0253.t1 b/test/mail/0253.t1
index 89e645ffb..11d017e13 100644
--- a/test/mail/0253.t1
+++ b/test/mail/0253.t1
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <abc@x.y.z>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: abc@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
diff --git a/test/mail/0253.t2 b/test/mail/0253.t2
index 7a64b8ccf..b30c72c8d 100644
--- a/test/mail/0253.t2
+++ b/test/mail/0253.t2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <xyz@x.y.z>)
 	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>
 From: xyz@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 2
 .
diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER
index 87ed8a038..434e191e6 100644
--- a/test/mail/0256.CALLER
+++ b/test/mail/0256.CALLER
@@ -1,13 +1,13 @@
 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; 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>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for unknown@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 22a2ecd35..5ef0a58b1 100644
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -1,13 +1,13 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00; 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>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <"abc@def"@unknown.domain>)
 	id 10HmaZ-0005vi-00
 	for unknown@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>
 From: "abc@def"@unknown.domain
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0256.abcd+test.ex+xxxx b/test/mail/0256.abcd+test.ex+xxxx
index 87ed8a038..434e191e6 100644
--- a/test/mail/0256.abcd+test.ex+xxxx
+++ b/test/mail/0256.abcd+test.ex+xxxx
@@ -1,13 +1,13 @@
 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; 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>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for unknown@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0256.abcd+unknown.domain+"abc@def" b/test/mail/0256.abcd+unknown.domain+"abc@def"
index 22a2ecd35..5ef0a58b1 100644
--- a/test/mail/0256.abcd+unknown.domain+"abc@def"
+++ b/test/mail/0256.abcd+unknown.domain+"abc@def"
@@ -1,13 +1,13 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00; 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>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <"abc@def"@unknown.domain>)
 	id 10HmaZ-0005vi-00
 	for unknown@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>
 From: "abc@def"@unknown.domain
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0258.userx b/test/mail/0258.userx
index 75ac31477..5abfe11b7 100644
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -3,12 +3,12 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 crheader: includes <
  > and ends CRLF
 Subject: this is still a header
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text includes <
 > and ends CRLF
@@ -23,11 +23,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 crheader: includes <
  > and ends CRLF
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text includes <
 > and ends CRLF
@@ -43,11 +43,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 crheader: includes <
  > and ends CRLF
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text includes <
 > and ends CRLF
@@ -62,9 +62,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-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: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message with no
 terminating LF
@@ -74,9 +74,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message with terminating CR
 
@@ -85,9 +85,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message with no
 terminating LF
@@ -97,9 +97,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-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: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message with terminating CR
 
@@ -108,12 +108,12 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-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: <E10HmbE-0005vi-00@myhost.test.ex>
 .dotheader: header line starts with a dot
 xxx: dot bare CR:.
  xyz
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
  weird header line
@@ -124,11 +124,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.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@myhost.test.ex>
 Subject: contains CR<
  > in the subject
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 CR.CR
 .
@@ -140,11 +140,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 Subject: contains CR<
  > in the subject
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 CR.CR
 .
diff --git a/test/mail/0260.userx b/test/mail/0260.userx
index c620db5d7..68c6bc139 100644
--- a/test/mail/0260.userx
+++ b/test/mail/0260.userx
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0266.CALLER b/test/mail/0266.CALLER
index 9fd70e00a..d09def199 100644
--- a/test/mail/0266.CALLER
+++ b/test/mail/0266.CALLER
@@ -4,13 +4,13 @@ Envelope-to: CALLER@test.ex
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbF-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: <E10HmbF-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: nmlist@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -26,9 +26,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for nmlist@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to nmlist.
 
diff --git a/test/mail/0266.filter b/test/mail/0266.filter
index 137fab1f6..30dbcb4cc 100644
--- a/test/mail/0266.filter
+++ b/test/mail/0266.filter
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for filter@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0266.filter2 b/test/mail/0266.filter2
index 443ca18c3..da3371030 100644
--- a/test/mail/0266.filter2
+++ b/test/mail/0266.filter2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for filter2@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to filter2.
 
diff --git a/test/mail/0266.filter3 b/test/mail/0266.filter3
index 62ddce124..14d861e66 100644
--- a/test/mail/0266.filter3
+++ b/test/mail/0266.filter3
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-0005vi-00
 	for filter3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to filter3.
 
diff --git a/test/mail/0266.list2 b/test/mail/0266.list2
index 7b7dd1431..74d706287 100644
--- a/test/mail/0266.list2
+++ b/test/mail/0266.list2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for list2@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to list2.
 
diff --git a/test/mail/0266.postmaster b/test/mail/0266.postmaster
index 7a17cf16e..bf47c0fed 100644
--- a/test/mail/0266.postmaster
+++ b/test/mail/0266.postmaster
@@ -4,12 +4,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for postmaster@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 The r1 router encountered the following error(s):
 
@@ -24,12 +24,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for postmaster@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 The r1 router encountered the following error(s):
 
@@ -44,12 +44,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for postmaster@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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 There's an error in your filter file.
 The file has been ignored.
@@ -66,12 +66,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for postmaster@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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 The r1a router encountered the following error(s):
 
@@ -86,12 +86,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbH-0005vi-00
 	for postmaster@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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 There's an error in your filter file.
 The file has been ignored.
@@ -108,12 +108,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbJ-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 There's an error in your filter file.
 The file has been ignored.
diff --git a/test/mail/0266.spqr b/test/mail/0266.spqr
index 6c1c436e7..52a775366 100644
--- a/test/mail/0266.spqr
+++ b/test/mail/0266.spqr
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for list@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0266.userx b/test/mail/0266.userx
index 6c1c436e7..52a775366 100644
--- a/test/mail/0266.userx
+++ b/test/mail/0266.userx
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for list@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0270.CALLER b/test/mail/0270.CALLER
index 9fd70e00a..d09def199 100644
--- a/test/mail/0270.CALLER
+++ b/test/mail/0270.CALLER
@@ -4,13 +4,13 @@ Envelope-to: CALLER@test.ex
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbF-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: <E10HmbF-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: nmlist@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -26,9 +26,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for nmlist@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to nmlist.
 
diff --git a/test/mail/0270.filter b/test/mail/0270.filter
index 137fab1f6..30dbcb4cc 100644
--- a/test/mail/0270.filter
+++ b/test/mail/0270.filter
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for filter@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0270.filter2 b/test/mail/0270.filter2
index 443ca18c3..da3371030 100644
--- a/test/mail/0270.filter2
+++ b/test/mail/0270.filter2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for filter2@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to filter2.
 
diff --git a/test/mail/0270.filter3 b/test/mail/0270.filter3
index 62ddce124..14d861e66 100644
--- a/test/mail/0270.filter3
+++ b/test/mail/0270.filter3
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-0005vi-00
 	for filter3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to filter3.
 
diff --git a/test/mail/0270.list2 b/test/mail/0270.list2
index 7b7dd1431..74d706287 100644
--- a/test/mail/0270.list2
+++ b/test/mail/0270.list2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for list2@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to list2.
 
diff --git a/test/mail/0270.postmaster b/test/mail/0270.postmaster
index 3a6d43923..949c2815b 100644
--- a/test/mail/0270.postmaster
+++ b/test/mail/0270.postmaster
@@ -4,12 +4,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for postmaster@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 The r1 router encountered the following error(s):
 
@@ -24,12 +24,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for postmaster@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 The r1 router encountered the following error(s):
 
@@ -44,12 +44,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for postmaster@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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 There's an error in your filter file.
 The file has been ignored.
@@ -66,12 +66,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for postmaster@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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 The r1a router encountered the following error(s):
 
@@ -86,12 +86,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbH-0005vi-00
 	for postmaster@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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 There's an error in your filter file.
 The file has been ignored.
@@ -108,12 +108,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
 	id 10HmbJ-0005vi-00
 	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 There's an error in your filter file.
 The file has been ignored.
diff --git a/test/mail/0270.spqr b/test/mail/0270.spqr
index 6c1c436e7..52a775366 100644
--- a/test/mail/0270.spqr
+++ b/test/mail/0270.spqr
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for list@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0270.userx b/test/mail/0270.userx
index 6c1c436e7..52a775366 100644
--- a/test/mail/0270.userx
+++ b/test/mail/0270.userx
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for list@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0274.abcd b/test/mail/0274.abcd
index c620db5d7..68c6bc139 100644
--- a/test/mail/0274.abcd
+++ b/test/mail/0274.abcd
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0274.redirect b/test/mail/0274.redirect
index c620db5d7..68c6bc139 100644
--- a/test/mail/0274.redirect
+++ b/test/mail/0274.redirect
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0274.userx b/test/mail/0274.userx
index c620db5d7..68c6bc139 100644
--- a/test/mail/0274.userx
+++ b/test/mail/0274.userx
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0274.xyz b/test/mail/0274.xyz
index c620db5d7..68c6bc139 100644
--- a/test/mail/0274.xyz
+++ b/test/mail/0274.xyz
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0280.CALLER b/test/mail/0280.CALLER
index 76002d971..eb2858159 100644
--- a/test/mail/0280.CALLER
+++ b/test/mail/0280.CALLER
@@ -1,13 +1,13 @@
 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; 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>
 X-Failed-Recipients: spqr@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: spqr@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,21 +24,21 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <spqr@test.ex>)
 	id 10HmaX-0005vi-00
 	for spqr@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.test.ex>
 From: spqr@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00; 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>
 X-Failed-Recipients: abcd@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: abcd@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -55,8 +55,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <abcd@test.ex>)
 	id 10HmaZ-0005vi-00
 	for abcd@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>
 From: abcd@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0283.CALLER b/test/mail/0283.CALLER
index 282f7c143..4ed2331cd 100644
--- a/test/mail/0283.CALLER
+++ b/test/mail/0283.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for CALLER@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>
 X-Failed-Recipients: somebody@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -30,9 +30,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for somebody@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 test
 
diff --git a/test/mail/0284.batched b/test/mail/0284.batched
index 51d20fbb5..249f65569 100644
--- a/test/mail/0284.batched
+++ b/test/mail/0284.batched
@@ -4,9 +4,9 @@ Envelope-to: x-t1@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: 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
@@ -15,9 +15,9 @@ Envelope-to: x-t4@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00; 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>
 From: 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
@@ -26,8 +26,8 @@ Envelope-to: y-t4@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0284.other.domain b/test/mail/0284.other.domain
index 0d5a67495..47818fe9b 100644
--- a/test/mail/0284.other.domain
+++ b/test/mail/0284.other.domain
@@ -3,8 +3,8 @@ Envelope-to: z-t3@other.domain
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0284.test.ex b/test/mail/0284.test.ex
index c0c5be90b..c537eea90 100644
--- a/test/mail/0284.test.ex
+++ b/test/mail/0284.test.ex
@@ -4,8 +4,8 @@ Envelope-to: x-t3@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0284.x-t2 b/test/mail/0284.x-t2
index 685deb48a..1f740be46 100644
--- a/test/mail/0284.x-t2
+++ b/test/mail/0284.x-t2
@@ -3,8 +3,8 @@ Envelope-to: x-t2@test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0284.y-t2 b/test/mail/0284.y-t2
index a2c4531e5..c0b14e8fb 100644
--- a/test/mail/0284.y-t2
+++ b/test/mail/0284.y-t2
@@ -3,8 +3,8 @@ Envelope-to: y-t2@test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0289.CALLER b/test/mail/0289.CALLER
index 67685017d..b671a34df 100644
--- a/test/mail/0289.CALLER
+++ b/test/mail/0289.CALLER
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for CALLER@myhost.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.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail failure - too many recipients
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent contained more recipients than allowed on this
 system. It was not delivered to any recipients.
diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index e97405211..861ec80fc 100644
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: failure@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for failure@myhost.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test junk data
 
diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER
index 8cb3b6454..9f0e99775 100644
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: failure1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -26,22 +26,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for failure1@myhost.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: failure2@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -58,8 +58,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for failure2@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0306.anyone b/test/mail/0306.anyone
index 2c8eb7251..5c5c574e7 100644
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for anyone@anywhere; 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>
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <anyone@anywhere>)
 	id 10HmaZ-0005vi-00
 	for list1@lists.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>
 From: anyone@anywhere
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <anyone@anywhere>)
 	id 10HmbB-0005vi-00
 	for nonlist@lists.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>
 From: anyone@anywhere
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index 2c8eb7251..5c5c574e7 100644
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for anyone@anywhere; 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>
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <anyone@anywhere>)
 	id 10HmaZ-0005vi-00
 	for list1@lists.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>
 From: anyone@anywhere
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <anyone@anywhere>)
 	id 10HmbB-0005vi-00
 	for nonlist@lists.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>
 From: anyone@anywhere
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER
index 59aae6e4e..f5ae66a5f 100644
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -2,6 +2,8 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: 1k@myhost.test.ex,
   55@myhost.test.ex,
   50@myhost.test.ex
@@ -9,8 +11,6 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message. This is a test message.
 This is a test message. This is a test message.
diff --git a/test/mail/0310.CALLER b/test/mail/0310.CALLER
index 55748724a..b6167a06f 100644
--- a/test/mail/0310.CALLER
+++ b/test/mail/0310.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: abcd@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
diff --git a/test/mail/0318.userx b/test/mail/0318.userx
index 6f77ef9ee..21ba6107b 100644
--- a/test/mail/0318.userx
+++ b/test/mail/0318.userx
@@ -2,8 +2,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the first message.
diff --git a/test/mail/0319.saved b/test/mail/0319.saved
index d23681e94..7ebe98d3e 100644
--- a/test/mail/0319.saved
+++ b/test/mail/0319.saved
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-subject: file
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+subject: file
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the first message.
 
diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER
index 5d836a512..bf5032fce 100644
--- a/test/mail/0321.CALLER
+++ b/test/mail/0321.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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>
 X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,9 +25,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for |/bin/cat\ /etc/aliases\ @test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 quit
 
diff --git a/test/mail/0324.userx b/test/mail/0324.userx
index b83389d67..08c14924d 100644
--- a/test/mail/0324.userx
+++ b/test/mail/0324.userx
@@ -3,6 +3,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -661,9 +663,7 @@ X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   This is the final line which should get chopped.
 X-Long: This is another header with the same name.   
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-match: NO
 Y-match: NO
 Z-match: NO
diff --git a/test/mail/0326.userx b/test/mail/0326.userx
index 2beaf0d6b..5bb9ecbc2 100644
--- a/test/mail/0326.userx
+++ b/test/mail/0326.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for pppp-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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 OLP: pppp-userx
 OLP: pppp-userx
 
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx+ssss@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 OLP: userx+ssss
 OLP: userx+ssss
 
@@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 OLP: userx
 
 
diff --git a/test/mail/0327.userx b/test/mail/0327.userx
index 78566bda4..ef8f8ac14 100644
--- a/test/mail/0327.userx
+++ b/test/mail/0327.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: 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
@@ -13,8 +13,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0328.userx b/test/mail/0328.userx
index c000ee10f..64849bbbf 100644
--- a/test/mail/0328.userx
+++ b/test/mail/0328.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 added: this header is added
 
 
diff --git a/test/mail/0329.userx b/test/mail/0329.userx
index c000ee10f..64849bbbf 100644
--- a/test/mail/0329.userx
+++ b/test/mail/0329.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 added: this header is added
 
 
diff --git a/test/mail/0330.userz1 b/test/mail/0330.userz1
index 0c6f01926..49b058381 100644
--- a/test/mail/0330.userz1
+++ b/test/mail/0330.userz1
@@ -4,10 +4,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Remove: This header should go
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Remove: This header should go
 From: 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
@@ -16,10 +16,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for UserY@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Remove: This header should go
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Remove: This header should go
 From: 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
@@ -28,9 +28,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Remove: This header should go
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Remove: This header should go
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0335.batch b/test/mail/0335.batch
index 9af240869..e2e8f7f6e 100644
--- a/test/mail/0335.batch
+++ b/test/mail/0335.batch
@@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for batch@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0335.clone b/test/mail/0335.clone
index 9f5ca6e87..cf4d861b8 100644
--- a/test/mail/0335.clone
+++ b/test/mail/0335.clone
@@ -7,8 +7,8 @@ Envelope-to: clone@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0335.final b/test/mail/0335.final
index ce7ba659a..bac018351 100644
--- a/test/mail/0335.final
+++ b/test/mail/0335.final
@@ -4,9 +4,9 @@ Envelope-to: onelevel2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: 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
@@ -15,9 +15,9 @@ Envelope-to: top2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: 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
@@ -28,8 +28,8 @@ Envelope-to: onelevel2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0338.a1-userx b/test/mail/0338.a1-userx
index 8aaf5e497..22dd5f6ad 100644
--- a/test/mail/0338.a1-userx
+++ b/test/mail/0338.a1-userx
@@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0338.a2-userx b/test/mail/0338.a2-userx
index 8aaf5e497..22dd5f6ad 100644
--- a/test/mail/0338.a2-userx
+++ b/test/mail/0338.a2-userx
@@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0341.mailbox b/test/mail/0341.mailbox
index e02fff8bb..657b84c20 100644
--- a/test/mail/0341.mailbox
+++ b/test/mail/0341.mailbox
@@ -4,8 +4,8 @@ Envelope-to: userx@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0346.x b/test/mail/0346.x
index af1c48018..2d1d3daf8 100644
--- a/test/mail/0346.x
+++ b/test/mail/0346.x
@@ -4,8 +4,8 @@ Envelope-to: x@dom1,
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0349.xxxx b/test/mail/0349.xxxx
index 8d9e1de01..34283efd4 100644
--- a/test/mail/0349.xxxx
+++ b/test/mail/0349.xxxx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing, testing
 
diff --git a/test/mail/0351.userx b/test/mail/0351.userx
index a0e4872f9..50bfd7d6c 100644
--- a/test/mail/0351.userx
+++ b/test/mail/0351.userx
@@ -3,6 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex
@@ -13,9 +15,7 @@ Resent-to: a@b, aa@bb
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u
-Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Resent-From: CALLER_NAME <CALLER@test.ex>
-Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: yes
 Found2: yes
 FOUND-found2: !!
@@ -39,6 +39,8 @@ ALL: Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex
@@ -49,9 +51,7 @@ Resent-to: a@b, aa@bb
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u
-Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Resent-From: CALLER_NAME <CALLER@test.ex>
-Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: yes
 Found2: yes
 
diff --git a/test/mail/0352.userx b/test/mail/0352.userx
index 4b16d1949..be18e8077 100644
--- a/test/mail/0352.userx
+++ b/test/mail/0352.userx
@@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From:                      
 To:                         
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: abcd no
 Found: xyz no
 TO: ><
@@ -19,13 +19,13 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 To: abcd@test.ex
 To:         
 To: xyz@test.ex
 To: pqr@test.ex
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,
@@ -39,13 +39,13 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 To:         
 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,
@@ -59,13 +59,13 @@ 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>
 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex
 To:         
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,
diff --git a/test/mail/0359.userx b/test/mail/0359.userx
index 67eae78d3..72147a6e9 100644
--- a/test/mail/0359.userx
+++ b/test/mail/0359.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-shadowed:
 
 
diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 36e4ef014..1b7454e1a 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -4,14 +4,14 @@ Envelope-to: CALLER@myhost.test.ex
 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: d3@myhost.test.ex,
   b1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -30,8 +30,8 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.a1 b/test/mail/0374.a1
index 7f05c69fc..0cfab456e 100644
--- a/test/mail/0374.a1
+++ b/test/mail/0374.a1
@@ -4,8 +4,8 @@ Envelope-to: a1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.a1-u b/test/mail/0374.a1-u
index 7f05c69fc..0cfab456e 100644
--- a/test/mail/0374.a1-u
+++ b/test/mail/0374.a1-u
@@ -4,8 +4,8 @@ Envelope-to: a1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.b1 b/test/mail/0374.b1
index 0828f8915..55805eee0 100644
--- a/test/mail/0374.b1
+++ b/test/mail/0374.b1
@@ -4,8 +4,8 @@ Envelope-to: b1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.c1 b/test/mail/0374.c1
index 34b259b57..7d9557c42 100644
--- a/test/mail/0374.c1
+++ b/test/mail/0374.c1
@@ -4,8 +4,8 @@ Envelope-to: c1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.d1 b/test/mail/0374.d1
index f8f550a4b..450c5a126 100644
--- a/test/mail/0374.d1
+++ b/test/mail/0374.d1
@@ -4,8 +4,8 @@ Envelope-to: d1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.d2 b/test/mail/0374.d2
index 10a2fd8ae..378730100 100644
--- a/test/mail/0374.d2
+++ b/test/mail/0374.d2
@@ -4,8 +4,8 @@ Envelope-to: d2@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0374.d3 b/test/mail/0374.d3
index bf4454b6a..d52db4b68 100644
--- a/test/mail/0374.d3
+++ b/test/mail/0374.d3
@@ -4,8 +4,8 @@ Envelope-to: d3@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 9fc9424a9..70ac5ad1a 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -4,13 +4,13 @@ Envelope-to: CALLER@myhost.test.ex
 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: e1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,8 +27,8 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.a1 b/test/mail/0375.a1
index 7f05c69fc..0cfab456e 100644
--- a/test/mail/0375.a1
+++ b/test/mail/0375.a1
@@ -4,8 +4,8 @@ Envelope-to: a1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.a1-u b/test/mail/0375.a1-u
index 031e92c38..686b60ab5 100644
--- a/test/mail/0375.a1-u
+++ b/test/mail/0375.a1-u
@@ -4,8 +4,8 @@ Envelope-to: a1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.b1 b/test/mail/0375.b1
index 0828f8915..55805eee0 100644
--- a/test/mail/0375.b1
+++ b/test/mail/0375.b1
@@ -4,8 +4,8 @@ Envelope-to: b1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.c1 b/test/mail/0375.c1
index 34b259b57..7d9557c42 100644
--- a/test/mail/0375.c1
+++ b/test/mail/0375.c1
@@ -4,8 +4,8 @@ Envelope-to: c1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.d1 b/test/mail/0375.d1
index f8f550a4b..450c5a126 100644
--- a/test/mail/0375.d1
+++ b/test/mail/0375.d1
@@ -4,8 +4,8 @@ Envelope-to: d1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.d2 b/test/mail/0375.d2
index 10a2fd8ae..378730100 100644
--- a/test/mail/0375.d2
+++ b/test/mail/0375.d2
@@ -4,8 +4,8 @@ Envelope-to: d2@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.d3 b/test/mail/0375.d3
index bf4454b6a..d52db4b68 100644
--- a/test/mail/0375.d3
+++ b/test/mail/0375.d3
@@ -4,8 +4,8 @@ Envelope-to: d3@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.e1 b/test/mail/0375.e1
index 207f5a3af..a7499ebc7 100644
--- a/test/mail/0375.e1
+++ b/test/mail/0375.e1
@@ -4,8 +4,8 @@ Envelope-to: e1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.f1 b/test/mail/0375.f1
index 91e6b3156..e478848da 100644
--- a/test/mail/0375.f1
+++ b/test/mail/0375.f1
@@ -4,8 +4,8 @@ Envelope-to: f1@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.f2 b/test/mail/0375.f2
index c0f59bf1c..93dc521d2 100644
--- a/test/mail/0375.f2
+++ b/test/mail/0375.f2
@@ -4,8 +4,8 @@ Envelope-to: f2@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.f3 b/test/mail/0375.f3
index 96c0c3ebb..b7a828a74 100644
--- a/test/mail/0375.f3
+++ b/test/mail/0375.f3
@@ -4,8 +4,8 @@ Envelope-to: f3@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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.h1 b/test/mail/0375.h1
index 7e0faaeac..ed9d17331 100644
--- a/test/mail/0375.h1
+++ b/test/mail/0375.h1
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for h1@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0375.h1-u b/test/mail/0375.h1-u
index 7e0faaeac..ed9d17331 100644
--- a/test/mail/0375.h1-u
+++ b/test/mail/0375.h1-u
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for h1@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0377.aaaa b/test/mail/0377.aaaa
index 872481d91..8bdec08a5 100644
--- a/test/mail/0377.aaaa
+++ b/test/mail/0377.aaaa
@@ -2,8 +2,8 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0377.bbbb b/test/mail/0377.bbbb
index 872481d91..8bdec08a5 100644
--- a/test/mail/0377.bbbb
+++ b/test/mail/0377.bbbb
@@ -2,8 +2,8 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0377.cccc b/test/mail/0377.cccc
index 872481d91..8bdec08a5 100644
--- a/test/mail/0377.cccc
+++ b/test/mail/0377.cccc
@@ -2,8 +2,8 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0378.file b/test/mail/0378.file
index 71b909d6d..37cef8763 100644
--- a/test/mail/0378.file
+++ b/test/mail/0378.file
@@ -3,8 +3,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for aaaa@myhost.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0379.bbbb b/test/mail/0379.bbbb
index 872481d91..8bdec08a5 100644
--- a/test/mail/0379.bbbb
+++ b/test/mail/0379.bbbb
@@ -2,8 +2,8 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0379.cccc b/test/mail/0379.cccc
index 872481d91..8bdec08a5 100644
--- a/test/mail/0379.cccc
+++ b/test/mail/0379.cccc
@@ -2,8 +2,8 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0380.bbbb b/test/mail/0380.bbbb
index 872481d91..8bdec08a5 100644
--- a/test/mail/0380.bbbb
+++ b/test/mail/0380.bbbb
@@ -2,8 +2,8 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
index e54e474fa..f151d9e46 100644
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -2,13 +2,13 @@ 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@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>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -56,10 +56,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: alice@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+To: alice@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -71,23 +71,23 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: alice@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+To: alice@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -134,10 +134,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: jabberwocky@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+To: jabberwocky@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -149,23 +149,23 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: jabberwocky@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+To: jabberwocky@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: redking@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -213,10 +213,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: redking@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+To: redking@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -228,9 +228,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-To: redking@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+To: redking@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index cd43c268b..f79ca70af 100644
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.CALLER
@@ -2,13 +2,13 @@ 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@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>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,10 +25,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: body size = 2
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Subject: body size = 2
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 X
 
@@ -36,13 +36,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -59,10 +59,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: body size = 200
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Subject: body size = 200
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -73,13 +73,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -96,10 +96,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: body size = 1600
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+Subject: body size = 1600
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
@@ -138,13 +138,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-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: <E10HmbE-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -163,9 +163,9 @@ Received: from CALLER by myhost.test.ex with local (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/test/mail/0393.userx b/test/mail/0393.userx
index ab724c4ef..3358d1ee9 100644
--- a/test/mail/0393.userx
+++ b/test/mail/0393.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing with filter
 
diff --git a/test/mail/0395.CALLER b/test/mail/0395.CALLER
index 55c623f70..d7285f91e 100644
--- a/test/mail/0395.CALLER
+++ b/test/mail/0395.CALLER
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaX-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: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail failure - malformed recipient address
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent contained a recipient address that was incorrectly
 constructed:
diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 5c7e799bf..a8f10e53e 100644
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -3,11 +3,11 @@ 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>
 From: philip
 To: userx
-Message-Id: <E10HmaY-0005vi-00@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
@@ -15,11 +15,11 @@ 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>
 From: userx@origin.ex
 To: userx@test.ex
-Message-Id: <E10HmaZ-0005vi-00@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
@@ -27,11 +27,11 @@ 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>
 From: userx@test.ex
 To: userx@test.ex
-Message-Id: <E10HmbA-0005vi-00@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
@@ -39,10 +39,10 @@ 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>
 From: philip
 To: userx
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -50,11 +50,11 @@ Received: from CALLER 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>
 From: userx
 To: userx
-Message-Id: <E10HmbC-0005vi-00@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
@@ -62,11 +62,11 @@ Received: from CALLER 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>
 From: userx@test.ex
 To: userx@test.ex
-Message-Id: <E10HmbD-0005vi-00@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
@@ -74,11 +74,11 @@ Received: from CALLER 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>
 From: userx
 To: userx
-Message-Id: <E10HmbE-0005vi-00@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
@@ -86,10 +86,10 @@ Received: from CALLER 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>
 From: userx@test.ex
 To: userx@test.ex
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0398.x b/test/mail/0398.x
index 85dde19fd..9c05c7c18 100644
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -3,9 +3,9 @@ Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for x@local; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing
 
diff --git a/test/mail/0404.sender b/test/mail/0404.sender
index fd77af8fe..d75996222 100644
--- a/test/mail/0404.sender
+++ b/test/mail/0404.sender
@@ -1,13 +1,13 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
 References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 rhubarb
 
diff --git a/test/mail/0408.userx b/test/mail/0408.userx
index 159be9823..99f22673e 100644
--- a/test/mail/0408.userx
+++ b/test/mail/0408.userx
@@ -3,8 +3,8 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0411.afolder b/test/mail/0411.afolder
index 96b94a189..18cb667c4 100644
--- a/test/mail/0411.afolder
+++ b/test/mail/0411.afolder
@@ -3,17 +3,17 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for t1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: 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 mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0412.CALLER b/test/mail/0412.CALLER
index 260252beb..89b8a60fe 100644
--- a/test/mail/0412.CALLER
+++ b/test/mail/0412.CALLER
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: CALLER_NAME <CALLER@test.ex>
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+From: CALLER_NAME <CALLER@test.ex>
 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	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>
 Reply-to:
 From: CALLER_NAME <CALLER@test.ex>
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>
@@ -38,10 +38,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-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: <E10HmaZ-0005vi-00@the.local.host.name>
 Reply-to: usery@test.ex
 From: CALLER_NAME <CALLER@test.ex>
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>
@@ -56,10 +56,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From:
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+From:
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Found: no
 
 FROM: 
diff --git a/test/mail/0421.a b/test/mail/0421.a
index e8cc113a5..6fb4b78c5 100644
--- a/test/mail/0421.a
+++ b/test/mail/0421.a
@@ -3,12 +3,12 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for a@b.c; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: abc@x.y.z
 To: abc@x.y.z
 Reply-to: abc@x.y.z
-Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 Sender: CALLER_NAME <abc@x.y.z>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Reply-to: abc@x.y.z
 
 
diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index 2cea2cb9b..e6cdf9e35 100644
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
 	id 10HmbC-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: <E10HmbC-0005vi-00@mail.test.ex>
 X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@mail.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,10 +28,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Filter: require "fileinto"; fileinto "userx-extra";
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@mail.test.ex>
+Filter: require "fileinto"; fileinto "userx-extra";
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 5
 
@@ -42,13 +42,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
 	id 10HmbE-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: <E10HmbE-0005vi-00@mail.test.ex>
 X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbE-0005vi-00@mail.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -65,10 +65,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Filter: fileinto "userx-extra";
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@mail.test.ex>
+Filter: fileinto "userx-extra";
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 6
 
diff --git a/test/mail/0428.inbox.JUNK b/test/mail/0428.inbox.JUNK
index 088f808c7..6d83deb36 100644
--- a/test/mail/0428.inbox.JUNK
+++ b/test/mail/0428.inbox.JUNK
@@ -6,15 +6,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@mail.test.ex>
 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }
-Message-Id: <E10HmbG-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 8
 
@@ -26,15 +26,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-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: <E10HmbI-0005vi-00@mail.test.ex>
 X-Sieve: 99-
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }
-Message-Id: <E10HmbI-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 10
 
@@ -46,15 +46,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbJ-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: <E10HmbJ-0005vi-00@mail.test.ex>
 X-Sieve: -99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-99" {
           fileinto "inbox.JUNK";
           stop;
         }
-Message-Id: <E10HmbJ-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 11
 
@@ -66,15 +66,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbK-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: <E10HmbK-0005vi-00@mail.test.ex>
 X-Sieve: -99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-98" {
           fileinto "inbox.JUNK";
           stop;
         }
-Message-Id: <E10HmbK-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 12
 
diff --git a/test/mail/0428.redirected b/test/mail/0428.redirected
index fc048367b..b436d75f4 100644
--- a/test/mail/0428.redirected
+++ b/test/mail/0428.redirected
@@ -6,10 +6,10 @@ Received: from CALLER by mail.test.ex 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
-Filter: redirect "redirected@test.ex";
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@mail.test.ex>
+Filter: redirect "redirected@test.ex";
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 4
 
diff --git a/test/mail/0428.someone b/test/mail/0428.someone
index a3ba52b88..65e5628d9 100644
--- a/test/mail/0428.someone
+++ b/test/mail/0428.someone
@@ -5,6 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	id 10HmbM-0005vi-00
 	for someone@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbM-0005vi-00@mail.test.ex>
 From: userx@test.ex
 To: someone@test.ex
 Subject: Automated reply
@@ -15,8 +17,6 @@ MIME-Version: 1.0
 Content-Type: text/plain;
 	charset="utf-8"
 Content-Transfer-Encoding: quoted-printable
-Message-Id: <E10HmbM-0005vi-00@mail.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 I am gone.  Not here.
 
diff --git a/test/mail/0428.userx b/test/mail/0428.userx
index 8c3402bd7..3e9cbd4f5 100644
--- a/test/mail/0428.userx
+++ b/test/mail/0428.userx
@@ -6,9 +6,9 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 1
 
@@ -20,10 +20,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Filter: if true { stop; fileinto "inbox.never"; }
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@mail.test.ex>
+Filter: if true { stop; fileinto "inbox.never"; }
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 7
 
@@ -35,15 +35,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@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@mail.test.ex>
 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "98" {
           fileinto "inbox.JUNK";
           stop;
         }
-Message-Id: <E10HmbH-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 9
 
@@ -55,12 +55,12 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <someone@test.ex>)
 	id 10HmbL-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: <E10HmbL-0005vi-00@mail.test.ex>
 To: userx@test.ex
 Filter: require ["vacation"]; 
         vacation "I am gone.  Not here.";
-Message-Id: <E10HmbL-0005vi-00@mail.test.ex>
 From: someone@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 13
 
@@ -71,15 +71,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <someone@test.ex>)
 	id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
 To: userx-suffix@test.ex
 Filter: require ["envelope","fileinto"]; 
         if envelope :matches :localpart "to" "*-suffix" {
           fileinto "userx-sawsuffix";
           stop; 
         }   
-Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
 From: someone@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 14
 
diff --git a/test/mail/0428.userx-extra b/test/mail/0428.userx-extra
index d7dc5ae1b..6e10c9d4e 100644
--- a/test/mail/0428.userx-extra
+++ b/test/mail/0428.userx-extra
@@ -6,10 +6,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Filter: require "fileinto"; fileinto "userx-extra";
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@mail.test.ex>
+Filter: require "fileinto"; fileinto "userx-extra";
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 3
 
diff --git a/test/mail/0428.userx-sawsuffix b/test/mail/0428.userx-sawsuffix
index ef2e8b5e3..6bb060832 100644
--- a/test/mail/0428.userx-sawsuffix
+++ b/test/mail/0428.userx-sawsuffix
@@ -5,15 +5,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <someone@test.ex>)
 	id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
 To: userx-suffix@test.ex
 Filter: require ["envelope","fileinto"]; 
         if envelope :matches :localpart "to" "*-suffix" {
           fileinto "userx-sawsuffix";
           stop; 
         }   
-Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
 From: someone@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 14
 
diff --git a/test/mail/0431.xxx b/test/mail/0431.xxx
index 263f826fe..30f2ea471 100644
--- a/test/mail/0431.xxx
+++ b/test/mail/0431.xxx
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for pre.xxx@a.b; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 MAIL FROM:<CALLER@myhost.test.ex>
@@ -17,8 +17,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
 	for pre.xxx@a.b; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
diff --git a/test/mail/0436.CALLER b/test/mail/0436.CALLER
index 71eedd979..c531a4da1 100644
--- a/test/mail/0436.CALLER
+++ b/test/mail/0436.CALLER
@@ -11,8 +11,8 @@ Envelope-to: a@d1.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
diff --git a/test/mail/0437.file b/test/mail/0437.file
index 4c0dd6c82..eb79fa789 100644
--- a/test/mail/0437.file
+++ b/test/mail/0437.file
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 First message
 
@@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second message
 
diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER
index 76b76de6b..1e9c21103 100644
--- a/test/mail/0444.CALLER
+++ b/test/mail/0444.CALLER
@@ -2,6 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: Mailer-Daemon@test.ex
 Reply-To: postmaster@test.ex
 To: CALLER@test.ex
@@ -9,9 +11,7 @@ Subject: Submission of mail from CALLER@test.ex directly to the XXX hosts
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 You sent the message below from the host
 
@@ -36,9 +36,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0444.userx b/test/mail/0444.userx
index 687b228a8..12690ffb3 100644
--- a/test/mail/0444.userx
+++ b/test/mail/0444.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0446.userx b/test/mail/0446.userx
index 4aebdbe23..69ee5075c 100644
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -3,11 +3,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 Received: the first received: line
 Received: the second received: line
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL: 3
 X-Router: 3
 
@@ -17,11 +17,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 Received: the first received: line
 Received: the second received: line
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL: 3
 X-Router: 3
 
diff --git a/test/mail/0449.userx b/test/mail/0449.userx
index 7976e948a..33fb1ad13 100644
--- a/test/mail/0449.userx
+++ b/test/mail/0449.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index 298abf033..6c9f41736 100644
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -2,6 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 To: CALLER@test.ex
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -11,9 +13,7 @@ h1: the first added header
 h2: the second added header
  continued on another line
 h3: the third added header
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is some body text
 
@@ -21,13 +21,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -44,10 +44,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-fno: 2
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+fno: 2
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another message 
 
diff --git a/test/mail/0452.userx b/test/mail/0452.userx
index 385e9ec18..842ec54e7 100644
--- a/test/mail/0452.userx
+++ b/test/mail/0452.userx
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-fno: 1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+fno: 1
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message.
 
diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 7faa6251a..7ac07a53f 100644
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbB-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: <E10HmbB-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
 
@@ -35,13 +35,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbD-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: <E10HmbD-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -58,9 +58,9 @@ Received: from CALLER by myhost.test.ex with local (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
 
@@ -68,13 +68,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbF-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: <E10HmbF-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -91,9 +91,9 @@ Received: from CALLER by myhost.test.ex with local (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
 
diff --git a/test/mail/0472.userz99 b/test/mail/0472.userz99
index ca8fa0d8a..193b36f9e 100644
--- a/test/mail/0472.userz99
+++ b/test/mail/0472.userz99
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userz@myhost.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing
 
@@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userz@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing 2
 
diff --git a/test/mail/0481.userx b/test/mail/0481.userx
index a9f142c35..990f05927 100644
--- a/test/mail/0481.userx
+++ b/test/mail/0481.userx
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Another: This is another header
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Another: This is another header
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Was-Remove-Me: >this header is to be removed<
 
 
diff --git a/test/mail/0487.userx b/test/mail/0487.userx
index 42d5c111a..b7510c691 100644
--- a/test/mail/0487.userx
+++ b/test/mail/0487.userx
@@ -4,9 +4,9 @@ Received: from CALLER (helo=x.y)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: unqualified
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+From: unqualified
 
 Test message.
 
diff --git a/test/mail/0491.userx b/test/mail/0491.userx
index d03d18632..404b65bac 100644
--- a/test/mail/0491.userx
+++ b/test/mail/0491.userx
@@ -3,9 +3,9 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"abc@xyz"@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"abc@xyz"@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From a.b@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -13,9 +13,9 @@ Received: from a.b by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <a.b@myhost.test.ex>)
 	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>
 From: CALLER_NAME <a.b@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From ".a.b"@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -23,9 +23,9 @@ Received: from ".a.b" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <".a.b"@myhost.test.ex>)
 	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>
 From: CALLER_NAME <".a.b"@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From "a.b."@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -33,9 +33,9 @@ Received: from "a.b." by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"a.b."@myhost.test.ex>)
 	id 10HmbA-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: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"a.b."@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From "a\"b"@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -43,9 +43,9 @@ Received: from "a\"b" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"a\"b"@myhost.test.ex>)
 	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>
 From: CALLER_NAME <"a\"b"@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From "abc@xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -53,10 +53,10 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"abc@xyz"@myhost.test.ex>)
 	id 10HmbC-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-From: x@y
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+From: x@y
 Sender: CALLER_NAME <"abc@xyz"@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From "abc%xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -64,8 +64,8 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"abc%xyz"@myhost.test.ex>)
 	id 10HmbD-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: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"abc%xyz"@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0493.a b/test/mail/0493.a
index ad9fceaea..a0d08aec7 100644
--- a/test/mail/0493.a
+++ b/test/mail/0493.a
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for a@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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 To: 12345@some.domain.or.other, 54321@some.domain.or.other,
     12345@some.domain.or.other, 54321@some.domain.or.other,
     12345@some.domain.or.other, 54321@some.domain.or.other,
diff --git a/test/mail/0494.userx b/test/mail/0494.userx
index 4379cb298..5b6a1e0d8 100644
--- a/test/mail/0494.userx
+++ b/test/mail/0494.userx
@@ -2,13 +2,13 @@ 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 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.test.ex>
 To: userx@test.ex
 Subject: testing, testing
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index 49cda3694..69e717a67 100644
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -5,11 +5,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for someone@el.se; Tue, 2 Mar 1999 09:44:33 +0000
 After-Received: some text
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: some@ne
 To: someone@el.se
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: data1 data1
 X-ACL-Warn: data2 data2
 At-End: some text
diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index 78312f0d1..a6ea3a711 100644
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <postmaster@y>)
 	id 10HmaX-0005vi-00
 	for userx@y; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: testing
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Subject: testing
 From: postmaster@y
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning (userx@y)
 
 
diff --git a/test/mail/0503.userx b/test/mail/0503.userx
index afa0a578b..533eb1660 100644
--- a/test/mail/0503.userx
+++ b/test/mail/0503.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test 1
 
diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index d2ead9f04..ff04b8ef0 100644
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -2,13 +2,13 @@ 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 postmaster@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>
 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@test.ex
 Subject: Mail delivery failed
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -35,8 +35,8 @@ Return-path: <>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 
 This is a test message
 
diff --git a/test/mail/0514.userx b/test/mail/0514.userx
index 5f22df611..bb31ef3af 100644
--- a/test/mail/0514.userx
+++ b/test/mail/0514.userx
@@ -3,9 +3,9 @@ Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"spaced user"@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"spaced user"@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing
 
diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index b9b1a1bc3..6783f7d04 100644
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -3,8 +3,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0522.CALLER b/test/mail/0522.CALLER
index 09386c456..01ff80221 100644
--- a/test/mail/0522.CALLER
+++ b/test/mail/0522.CALLER
@@ -2,13 +2,13 @@ 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@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>
 X-Failed-Recipients: nofilter@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for nofilter@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>
 X-Failed-Recipients: filter@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for filter@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0523.userx b/test/mail/0523.userx
index 854cab5c0..8da8da320 100644
--- a/test/mail/0523.userx
+++ b/test/mail/0523.userx
@@ -6,9 +6,9 @@ Envelope-to: four@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Delivered-To: one@test.ex
 Delivered-To: userx@test.ex
 
diff --git a/test/mail/0530.CALLER b/test/mail/0530.CALLER
index d07382180..278f3ab2f 100644
--- a/test/mail/0530.CALLER
+++ b/test/mail/0530.CALLER
@@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, no In-Reply-to
 In-Reply-To: <m1@b>
 References: <m1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -17,14 +17,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@myhost.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>
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, In-Reply-to
 In-Reply-To: <m1@b>
 References: <i1@b> <m1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -32,14 +32,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for CALLER@myhost.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.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (1), In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <m1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -47,14 +47,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
 	for CALLER@myhost.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.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (5), no In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> <m1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -62,14 +62,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbG-0005vi-00
 	for CALLER@myhost.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.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (15), In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> <m1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -77,12 +77,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbI-0005vi-00
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, no In-Reply-to
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -90,13 +90,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbK-0005vi-00
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, In-Reply-to
 References: <i1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -104,13 +104,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbM-0005vi-00
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (1), In-Reply-to
 References: <r1@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -118,13 +118,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbO-0005vi-00
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (5), no In-Reply-to
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
@@ -132,13 +132,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbQ-0005vi-00
 	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (15), In-Reply-to
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
 Auto-Submitted: auto-replied
-Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the text of the autoreply.
 
diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index a35a78259..98e03c6c6 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,9 +24,9 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -34,13 +34,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: userx@retry.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -57,9 +57,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@retry.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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -67,13 +67,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for CALLER@myhost.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.test.ex>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -91,9 +91,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index e669ef777..4685a414f 100644
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <mailok@test.ex>)
 	id 10HmaX-0005vi-00
 	for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-cond: accept
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+cond: accept
 From: mailok@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 MAIL: one
 MAIL: two
 MAIL: three
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for rcptok@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 NOTSMTP: rcptok@test.ex
 
 Test non-SMTP message.
diff --git a/test/mail/0533.mbox b/test/mail/0533.mbox
index 26716f507..7b561cbfd 100644
--- a/test/mail/0533.mbox
+++ b/test/mail/0533.mbox
@@ -4,9 +4,9 @@ Envelope-to: file-usery=mbox@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A test message.
 
diff --git a/test/mail/0533.mbox2 b/test/mail/0533.mbox2
index 4d2c7548b..f7ae33bfe 100644
--- a/test/mail/0533.mbox2
+++ b/test/mail/0533.mbox2
@@ -4,9 +4,9 @@ Envelope-to: file-usera=mbox2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A test message.
 
diff --git a/test/mail/0535.userx b/test/mail/0535.userx
index e3994508e..62f708f03 100644
--- a/test/mail/0535.userx
+++ b/test/mail/0535.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 No headers supplied.
 
@@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	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.test.ex>
 From: x@y
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 No headers supplied.
 
diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 9a3e0ea34..e92c7c606 100644
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbC-0005vi-00
 	for oksender@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.test.ex>
 X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,8 +25,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <oksender@test.ex>)
 	id 10HmbB-0005vi-00
 	for user22@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>
 From: oksender@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0536.user1 b/test/mail/0536.user1
index b918842f9..f8f09825b 100644
--- a/test/mail/0536.user1
+++ b/test/mail/0536.user1
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for user1@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user1@test.ex
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -20,8 +20,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <user1@test.ex>)
 	id 10HmaX-0005vi-00
 	for user1@myhost.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.test.ex>
 From: user1@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0536.user2 b/test/mail/0536.user2
index 64bd15814..8ff7b6f3a 100644
--- a/test/mail/0536.user2
+++ b/test/mail/0536.user2
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for user2@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user2@test.ex
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -20,8 +20,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <user2@test.ex>)
 	id 10HmaY-0005vi-00
 	for user1@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>
 From: user2@test.ex
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0551.userx b/test/mail/0551.userx
index 01ca394c0..7e448b25b 100644
--- a/test/mail/0551.userx
+++ b/test/mail/0551.userx
@@ -2,9 +2,9 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
@@ -12,9 +12,9 @@ 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 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
@@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 3
 
diff --git a/test/mail/0551.usery b/test/mail/0551.usery
index e4d855b81..7f822888a 100644
--- a/test/mail/0551.usery
+++ b/test/mail/0551.usery
@@ -2,9 +2,9 @@ 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
diff --git a/test/mail/0551.userz b/test/mail/0551.userz
index 29b2f0da7..760f2665b 100644
--- a/test/mail/0551.userz
+++ b/test/mail/0551.userz
@@ -2,9 +2,9 @@ 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 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index 886e3e63f..2bb5aa0a2 100644
--- a/test/mail/2008.CALLER
+++ b/test/mail/2008.CALLER
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message. Contains FF: ÿ
@@ -25,9 +25,9 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts
diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd
index bfa581348..8b37b136e 100644
--- a/test/mail/2008.abcd
+++ b/test/mail/2008.abcd
@@ -8,9 +8,9 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts
diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index 598f07f33..28a57acd2 100644
--- a/test/mail/2008.xyz
+++ b/test/mail/2008.xyz
@@ -7,9 +7,9 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts
diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index ab47286c4..395b12109 100644
--- a/test/mail/2013.userx
+++ b/test/mail/2013.userx
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
@@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
diff --git a/test/mail/2017.userx b/test/mail/2017.userx
index 5b0d85f90..4aeb954fd 100644
--- a/test/mail/2017.userx
+++ b/test/mail/2017.userx
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
@@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 9d1a54a75..1c3526c43 100644
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message
diff --git a/test/mail/2027.usery b/test/mail/2027.usery
index e76df9b2f..56e989c4e 100644
--- a/test/mail/2027.usery
+++ b/test/mail/2027.usery
@@ -8,9 +8,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for usery@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher= peerdn=
 
 Test message
diff --git a/test/mail/2600.userx b/test/mail/2600.userx
index 3e636bdb3..e81b64d21 100644
--- a/test/mail/2600.userx
+++ b/test/mail/2600.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/3403.userx b/test/mail/3403.userx
index d8a0676d6..11e00c316 100644
--- a/test/mail/3403.userx
+++ b/test/mail/3403.userx
@@ -4,9 +4,9 @@ Received: from CALLER (helo=testing.ex)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 aid: userx
 
 Test data
diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index 713abc882..72cf09efe 100644
--- a/test/mail/3451.userx
+++ b/test/mail/3451.userx
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
@@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 713abc882..72cf09efe 100644
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
@@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
diff --git a/test/mail/5000.new/1.myhost.test.ex b/test/mail/5000.new/1.myhost.test.ex
index 517121389..8248ae7d1 100644
--- a/test/mail/5000.new/1.myhost.test.ex
+++ b/test/mail/5000.new/1.myhost.test.ex
@@ -2,9 +2,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-maildir:maildir_
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+maildir:maildir_
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
diff --git a/test/mail/5000.new/2.myhost.test.ex b/test/mail/5000.new/2.myhost.test.ex
index 1b5b06498..9ca1547b9 100644
--- a/test/mail/5000.new/2.myhost.test.ex
+++ b/test/mail/5000.new/2.myhost.test.ex
@@ -2,10 +2,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-maildir:maildir_
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+maildir:maildir_
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/test/mail/5000.new/3.myhost.test.ex:S370 b/test/mail/5000.new/3.myhost.test.ex:S370
index 7ea68ff5a..4512907d1 100644
--- a/test/mail/5000.new/3.myhost.test.ex:S370
+++ b/test/mail/5000.new/3.myhost.test.ex:S370
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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>
 maildir:maildir_tagged_
 tag:Ssss
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
diff --git a/test/mail/5000.new/4.myhost.test.ex,S=370 b/test/mail/5000.new/4.myhost.test.ex,S=370
index ed3879152..d84c6e62e 100644
--- a/test/mail/5000.new/4.myhost.test.ex,S=370
+++ b/test/mail/5000.new/4.myhost.test.ex,S=370
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>
 maildir:maildir_tagged_
 tag:,S=sss
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
diff --git a/test/mail/5000.new/5.myhost.test.ex b/test/mail/5000.new/5.myhost.test.ex
index 054bf9048..4430aa64c 100644
--- a/test/mail/5000.new/5.myhost.test.ex
+++ b/test/mail/5000.new/5.myhost.test.ex
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-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: <E10HmbD-0005vi-00@myhost.test.ex>
 maildir:maildir_tagged_
 tag:${if eq{0}{1}{rhubarb}fail}
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
diff --git a/test/mail/5000.new/6.myhost.test.ex b/test/mail/5000.new/6.myhost.test.ex
index df71e1788..77f583f18 100644
--- a/test/mail/5000.new/6.myhost.test.ex
+++ b/test/mail/5000.new/6.myhost.test.ex
@@ -3,6 +3,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-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: <E10HmbE-0005vi-00@myhost.test.ex>
 maildir:maildir_tagged_
 tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -10,8 +12,6 @@ tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
diff --git a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
index be53589ee..861a2d61d 100644
--- a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
+++ b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
@@ -3,9 +3,9 @@ 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>
 maildir:maildir_taggedX_
 tag:,S=sss:2,S
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
diff --git a/test/mail/5002.new/1.myhost.test.ex b/test/mail/5002.new/1.myhost.test.ex
index 4b8954864..b212d52da 100644
--- a/test/mail/5002.new/1.myhost.test.ex
+++ b/test/mail/5002.new/1.myhost.test.ex
@@ -2,9 +2,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message of a reasonable size. Fifty here.
 This is a message of a reasonable size. Fifty here.
diff --git a/test/mail/5004.new/1.mail.test.ex b/test/mail/5004.new/1.mail.test.ex
index 88be14504..9685588cd 100644
--- a/test/mail/5004.new/1.mail.test.ex
+++ b/test/mail/5004.new/1.mail.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing
diff --git a/test/mail/5005.nofile/new/1.myhost.test.ex b/test/mail/5005.nofile/new/1.myhost.test.ex
index 5da3db575..001bbcf77 100644
--- a/test/mail/5005.nofile/new/1.myhost.test.ex
+++ b/test/mail/5005.nofile/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for nofile@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message for nofile
diff --git a/test/mail/5005.userx/new/2.myhost.test.ex b/test/mail/5005.userx/new/2.myhost.test.ex
index dcb7049b8..0edfe533c 100644
--- a/test/mail/5005.userx/new/2.myhost.test.ex
+++ b/test/mail/5005.userx/new/2.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
diff --git a/test/mail/5006.userx/new/1.myhost.test.ex b/test/mail/5006.userx/new/1.myhost.test.ex
index 4db91ee5a..d9a403d25 100644
--- a/test/mail/5006.userx/new/1.myhost.test.ex
+++ b/test/mail/5006.userx/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
diff --git a/test/mail/5007.userx/new/1.myhost.test.ex b/test/mail/5007.userx/new/1.myhost.test.ex
index c077e2b7e..e33e57fdb 100644
--- a/test/mail/5007.userx/new/1.myhost.test.ex
+++ b/test/mail/5007.userx/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
diff --git a/test/mail/5050.userx b/test/mail/5050.userx
index 2b5ed9885..2131c6497 100644
--- a/test/mail/5050.userx
+++ b/test/mail/5050.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Initial test message, no prefix.
 
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.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@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 
diff --git a/test/mail/5050.usery b/test/mail/5050.usery
index fd87afe8a..32d932a83 100644
--- a/test/mail/5050.usery
+++ b/test/mail/5050.usery
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for usery@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 
diff --git a/test/mail/5050.userz b/test/mail/5050.userz
index 75b251f9f..59b203319 100644
--- a/test/mail/5050.userz
+++ b/test/mail/5050.userz
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for userz@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)

 	id 10HmbB-0005vi-00

 	for mbx_userz@test.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>

 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 

 Test message with mbx_ prefix

 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for userz@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 
diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index 4704c33ff..f1b3d8e64 100644
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -4,10 +4,10 @@ Envelope-to: userx@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; Tue, 2 Mar 1999 09:44:33 +0000
-mailbox: copied
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+mailbox: copied
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Recipient: local_part= domain=myhost.test.ex
 X-Home: /usr
 
@@ -18,13 +18,13 @@ Envelope-to: CALLER@myhost.test.ex
 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: jack@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Recipient: local_part=CALLER domain=myhost.test.ex
 X-Home: 
 
@@ -42,10 +42,10 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
-mailbox: copied
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+mailbox: copied
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -54,13 +54,13 @@ Envelope-to: CALLER@myhost.test.ex
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@myhost.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>
 X-Failed-Recipients: jack@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Recipient: local_part=CALLER domain=myhost.test.ex
 X-Home: 
 
@@ -78,9 +78,9 @@ 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 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is another test message.
 
diff --git a/test/mail/5200.postmaster b/test/mail/5200.postmaster
index 0068db5da..6617c7b0c 100644
--- a/test/mail/5200.postmaster
+++ b/test/mail/5200.postmaster
@@ -5,12 +5,12 @@ 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 postmaster@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>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmaX-0005vi-00 has been frozen.
 The sender is <CALLER@test.ex>.
diff --git a/test/mail/5203.userx b/test/mail/5203.userx
index 1cb2875ec..2dca8a448 100644
--- a/test/mail/5203.userx
+++ b/test/mail/5203.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 max fd = dddd   0 opt=0 STATUS   1 opt=0 STATUS   2 opt=0 STATUS 
diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index d468c4a9d..2dfc48952 100644
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 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
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,9 +25,9 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
diff --git a/test/mail/5207.qpgm b/test/mail/5207.qpgm
index da024f7a8..7bf586034 100644
--- a/test/mail/5207.qpgm
+++ b/test/mail/5207.qpgm
@@ -2,17 +2,17 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: 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 myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/9001.CALLER b/test/mail/9001.CALLER
index 749ea8a43..a07de714a 100644
--- a/test/mail/9001.CALLER
+++ b/test/mail/9001.CALLER
@@ -2,13 +2,13 @@ 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,8 +25,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/rejectlog/0021 b/test/rejectlog/0021
index edfe63fe9..04c1f3a94 100644
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	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
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: userx@test1
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
 Envelope-from: <ok@test2>
 Envelope-to: <userx@test.ex>
@@ -15,9 +15,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
 	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
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: ok@test2
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
 Envelope-from: <ok@test4>
 Envelope-to: <userx@test.ex>
@@ -25,9 +25,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
 	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
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: ok@test4
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL
 1999-03-02 09:44:33 H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 1999-03-02 09:44:33 mail accepted "mail from:<ok@test1>" "<ok@test1>"
@@ -42,9 +42,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	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
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: userx@test1
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 Envelope-from: <userx@test1>
 Envelope-to: <userx@test.ex>
@@ -52,8 +52,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	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
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: userx@test1
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex
 1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=ssss" "<ok@test3> SIZE=1234"
diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 716e35cf0..2d97471f9 100644
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -5,27 +5,27 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: @
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+F From: @
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: <x@y>, @
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+F From: <x@y>, @
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: <x@y>
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+F From: <x@y>
   X-warning: this is a test warning
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
@@ -34,17 +34,17 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbA-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: x@y
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	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
+I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 T to: group name: x@y, p@q;
 R reply-to: group name:;
-I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
   X-warning: this is a test warning
diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index 9a9421433..bff8a746c 100644
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -13,24 +13,24 @@ Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Subject: data1
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+  Subject: data1
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Subject: data2
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+  Subject: data2
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-  Subject: data3
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+  Subject: data3
diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 32a9d0576..c1888ad68 100644
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -5,7 +5,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big
diff --git a/test/rejectlog/0181 b/test/rejectlog/0181
index ea4814552..47ca48209 100644
--- a/test/rejectlog/0181
+++ b/test/rejectlog/0181
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=225 max=100
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=101 max=100
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0220 b/test/rejectlog/0220
index 0ea1b2a0b..f322fefc3 100644
--- a/test/rejectlog/0220
+++ b/test/rejectlog/0220
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500
 Envelope-from: <>
 Envelope-to: <userx@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0221 b/test/rejectlog/0221
index 0ea1b2a0b..f322fefc3 100644
--- a/test/rejectlog/0221
+++ b/test/rejectlog/0221
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500
 Envelope-from: <>
 Envelope-to: <userx@myhost.test.ex>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 5dbe6259a..30b7ac01f 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -4,18 +4,18 @@ Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: <bad@syntax
-I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+F From: <bad@syntax
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: bad@domain
-I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+F From: bad@domain
 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
@@ -25,18 +25,18 @@ P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <nosyntax@x>)
 	id 10HmaZ-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: <bad@syntax
-I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+F From: <bad@syntax
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-F From: <unverifiable@y>
-I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+F From: <unverifiable@y>
 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
diff --git a/test/rejectlog/0451 b/test/rejectlog/0451
index e2616875e..ef3633778 100644
--- a/test/rejectlog/0451
+++ b/test/rejectlog/0451
@@ -6,9 +6,9 @@ P Received: from CALLER (helo=a.b.c.d)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@test.ex> rejected after DATA: Sender verify failed
 Envelope-from: <CALLER@test.ex>
 Envelope-to: <good@test.ex>
@@ -17,6 +17,6 @@ P Received: from CALLER (helo=a.b.c.d)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index cab143858..51402d1fa 100644
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -4,6 +4,6 @@ Envelope-to: <abc@xyz>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
-T To: abc@xyz.
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+T To: abc@xyz.
diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index b2ece3e1f..c86cd555d 100644
--- a/test/rejectlog/0468
+++ b/test/rejectlog/0468
@@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>
@@ -15,6 +15,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index ef53406f4..47afbaa7c 100644
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -5,6 +5,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for aa@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0505 b/test/rejectlog/0505
index 2c56b7f1e..dd1021153 100644
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx: cannot use "control=submission" in EHLO or HELO ACL
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL
 Envelope-from: <CALLER@myhost.test.ex>
@@ -16,7 +16,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	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
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 U=CALLER temporarily rejected connection in "connect" ACL: cannot use "control=queue_only" in connection ACL
diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index 957071a1f..28b2f5f7e 100644
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -5,10 +5,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
-T To: a@b.c, himself <usery@dom.com>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+T To: a@b.c, himself <usery@dom.com>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
@@ -16,10 +16,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
-T To: a@b.c, himself <usery@dom.com>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+T To: a@b.c, himself <usery@dom.com>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
@@ -28,9 +28,9 @@ Envelope-to: <userx@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 T To: a@b.c, himself <usery@dom.com>
 * Cc: unqualified, userx@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0536 b/test/rejectlog/0536
index bf06473b6..d395838c7 100644
--- a/test/rejectlog/0536
+++ b/test/rejectlog/0536
@@ -23,9 +23,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <user1@test.ex>)
 	id 10HmaX-0005vi-00
 	for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: user1@test.ex
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<user2@test.ex> rejected by non-SMTP ACL: 599 Main code
 Envelope-from: <user2@test.ex>
 Envelope-to: <user1@myhost.test.ex>
@@ -33,9 +33,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <user2@test.ex>)
 	id 10HmaY-0005vi-00
 	for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: user2@test.ex
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user20@test.ex>: No code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user21@test.ex>: Main code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user22@test.ex>: Main and extended code
diff --git a/test/rejectlog/0539 b/test/rejectlog/0539
index 74da8e6e1..6191a89fb 100644
--- a/test/rejectlog/0539
+++ b/test/rejectlog/0539
@@ -9,6 +9,6 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stderr/0275 b/test/stderr/0275
index 79cdb9dfc..0838fe389 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -119,9 +119,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0278 b/test/stderr/0278
index 39c5a5692..a262cb712 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -78,9 +78,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0294 b/test/stderr/0294
index 184cf9f41..896e8ea39 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -29,9 +29,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: x@y
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -57,9 +57,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: x@y
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0317 b/test/stderr/0317
index 4a28f2620..c0ea3d0b4 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -10,12 +10,12 @@ Cc: a@b.c
 Bcc: p@q.r
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 T To: x@y.z
 C Cc: a@b.c
 * Bcc: p@q.r
-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -45,15 +45,15 @@ Resent-cc: pp@qq.rr
 Resent-bcc: xx@yy.zz
 
 >>Headers after rewriting and local additions:
+  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 T To: x@y.z
 C Cc: a@b.c
 B Bcc: p@q.r
 T Resent-to: aa@bb.cc
 C Resent-cc: pp@qq.rr
 * Resent-bcc: xx@yy.zz
-I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 F Resent-From: CALLER_NAME <CALLER@test.ex>
-  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0361 b/test/stderr/0361
index 07e0ce3d1..62c2b9d4c 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -27,9 +27,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0388 b/test/stderr/0388
index f7855826f..eaa4ec044 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -186,13 +186,13 @@ rewrite_one_header: type=T:
   To: CALLER@myhost.test.ex
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
   X-Failed-Recipients: x@y
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
   Subject: Mail delivery failed: returning message to sender
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0402 b/test/stderr/0402
index 20c2e7b3f..902c14095 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -28,9 +28,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 expanding: ${tod_full}
diff --git a/test/stderr/0403 b/test/stderr/0403
index 14e70286a..718e57163 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0404 b/test/stderr/0404
index d37788c05..4f8296add 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -87,6 +87,8 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
@@ -119,9 +121,7 @@ R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@
 **** debug string too long - truncated ****
-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -265,14 +265,14 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.e
 **** debug string too long - truncated ****
   In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
   References: <E10HmaX-0005vi-00@mail.test.ex>
   Auto-Submitted: auto-replied
-I Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0408 b/test/stderr/0408
index 8eeab810c..4fae9e9f6 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0465 b/test/stderr/0465
index 4c84b1453..d4d4fd203 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -63,9 +63,9 @@ rewrite_one_header: type=T:
   To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:
-T To: abc@domain.
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+T To: abc@domain.
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
@@ -125,9 +125,9 @@ rewrite_one_header: type=T:
   To: abc@xyz.
 search_tidyup called
 >>Headers after rewriting and local additions:
-T To: abc@xyz.
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+T To: abc@xyz.
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/0489 b/test/stderr/0489
index 291dda645..ffcf33dec 100644
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -10,9 +10,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -40,9 +40,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: John "Jack" Smith <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
@@ -69,9 +69,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line
@@ -98,9 +98,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line
@@ -127,9 +127,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbB-0005vi-00
 >>Generated Received: header line
@@ -156,9 +156,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbC-0005vi-00
 >>Generated Received: header line
@@ -185,9 +185,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbD-0005vi-00
 >>Generated Received: header line
@@ -214,9 +214,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbE-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/2600 b/test/stderr/2600
index 64b3133b1..bc770e28d 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -294,9 +294,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@myhost.test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/5004 b/test/stderr/5004
index 4d6968f19..0272c2a04 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -22,9 +22,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/5005 b/test/stderr/5005
index e27fbfaac..a471ce79a 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
@@ -188,9 +188,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
@@ -356,9 +356,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line
@@ -535,9 +535,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line
diff --git a/test/stderr/5006 b/test/stderr/5006
index 1dd6dc9ce..af10c5b13 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
+  Date: Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
diff --git a/test/stdout/0015 b/test/stdout/0015
index d82e3cbc9..d4c476794 100644
--- a/test/stdout/0015
+++ b/test/stdout/0015
@@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
 	for S+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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 More text.
 .
@@ -40,9 +40,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for Userx-S@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 More text.
 .
diff --git a/test/stdout/0033 b/test/stdout/0033
index 82aa1e93e..5df5759d1 100644
--- a/test/stdout/0033
+++ b/test/stdout/0033
@@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for list@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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -47,9 +47,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for list@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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0035 b/test/stdout/0035
index 6b5928b77..c80d9fd9d 100644
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -174,9 +174,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	(envelope-from <a@y>)
 	id 10HmaY-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: a@y
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
@@ -196,8 +196,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
@@ -239,10 +239,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	(envelope-from <a@y>)
 	id 10HmbB-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-ddd* Sender: sender@some.where
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+ddd* Sender: sender@some.where
 dddF From: a@y
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbC-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
@@ -263,10 +263,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	(envelope-from <a@y>)
 	id 10HmbC-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-dddS Sender: sender@some.where
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+dddS Sender: sender@some.where
 dddF From: a@y
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbD-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
@@ -287,7 +287,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	(envelope-from <a@y>)
 	id 10HmbD-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-ddd* Sender: sender@some.where
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+ddd* Sender: sender@some.where
 dddF From: SomeName <a@y>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0037 b/test/stdout/0037
index 603298279..4c8bdd5c2 100644
--- a/test/stdout/0037
+++ b/test/stdout/0037
@@ -239,11 +239,11 @@ Recipient   = CALLER@test.ex
 Testing Exim filter file "TESTSUITE/aux-var/0037.F"
 
 Testprint: ------------------------------------------------
-Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nTest-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing
 Testprint: ------------------------------------------------
 Headers remove "test-headers:more-test-headers"
 Headers add "added-header: this is added\nadded-header2: a second line"
-Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nFrom: x@y\nSubject: testing, testing\nadded-header: this is added\nadded-header2: a second line
 Testprint: ------------------------------------------------
 Testprint: message_size      = 122
 Testprint: message_body_size = 0
diff --git a/test/stdout/0093 b/test/stdout/0093
index 4762c64ac..236300048 100644
--- a/test/stdout/0093
+++ b/test/stdout/0093
@@ -27,11 +27,11 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0093.f-3"
 Testprint: From: is defined
 Testprint: Absent: is not defined
 Testprint: ----------------------
-Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME <CALLER@test.ex>
 Testprint: ----------------------
-Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++more
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME <CALLER@test.ex>+++more
 Testprint: ----------------------
-Testprint: +++From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++
+Testprint: +++Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME <CALLER@test.ex>+++
 Testprint: ----------------------
 Testprint: From: >a@b<
 Testprint: this header is repeated\n          and continued\nthis header is repeated\n          and continued\nthis header is repeated\n          and continued
diff --git a/test/stdout/0100 b/test/stdout/0100
index f4c25d7e5..5d260e735 100644
--- a/test/stdout/0100
+++ b/test/stdout/0100
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
-..dotheader: This is perfectly legal
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+..dotheader: This is perfectly legal
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot
@@ -46,10 +46,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbM-0005vi-00
 	for userx@filtered.com; Tue, 2 Mar 1999 09:44:33 +0000
-..dotheader: This is perfectly legal
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
+..dotheader: This is perfectly legal
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot
diff --git a/test/stdout/0101 b/test/stdout/0101
index c5e6a37c3..aeda5eb54 100644
--- a/test/stdout/0101
+++ b/test/stdout/0101
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
-..dotheader: This is perfectly legal
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+..dotheader: This is perfectly legal
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot
diff --git a/test/stdout/0143 b/test/stdout/0143
index 1075fed7f..32e92d513 100644
--- a/test/stdout/0143
+++ b/test/stdout/0143
@@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0163 b/test/stdout/0163
index 8e8832381..bd377b1ff 100644
--- a/test/stdout/0163
+++ b/test/stdout/0163
@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890
diff --git a/test/stdout/0177 b/test/stdout/0177
index f558f08d2..af69f2b2c 100644
--- a/test/stdout/0177
+++ b/test/stdout/0177
@@ -23,10 +23,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
 	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: freeze this (3)
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+Subject: freeze this (3)
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a third message to be frozen.
 .
diff --git a/test/stdout/0179 b/test/stdout/0179
index 9013698df..50583d25c 100644
--- a/test/stdout/0179
+++ b/test/stdout/0179
@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -32,9 +32,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for abcd@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0185 b/test/stdout/0185
index dba278f72..a7122b1d6 100644
--- a/test/stdout/0185
+++ b/test/stdout/0185
@@ -19,10 +19,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Subject: freeze this
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be frozen.
 .
diff --git a/test/stdout/0190 b/test/stdout/0190
index 66bd28c1c..fa9ad7c5a 100644
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -126,9 +126,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -151,9 +151,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -176,9 +176,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -203,9 +203,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -228,9 +228,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -257,9 +257,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
diff --git a/test/stdout/0200 b/test/stdout/0200
index 77b589ba5..cb6431636 100644
--- a/test/stdout/0200
+++ b/test/stdout/0200
@@ -1,2 +1,2 @@
-xx@host.test.ex is undeliverable: mail domain "host.test.ex._bad" is syntactically invalid
-yy@host.test.ex cannot be resolved at this time: lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name
+xx@host.test.ex is undeliverable: Unrouteable address
+yy@host.test.ex cannot be resolved at this time: lookup of host "bad_host.test.ex" failed in domainlist router
diff --git a/test/stdout/0203 b/test/stdout/0203
index b311e114c..a59fabdbf 100644
--- a/test/stdout/0203
+++ b/test/stdout/0203
@@ -16,9 +16,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1
 .
diff --git a/test/stdout/0209 b/test/stdout/0209
index 90a59b259..238adf062 100644
--- a/test/stdout/0209
+++ b/test/stdout/0209
@@ -32,9 +32,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1
 .
diff --git a/test/stdout/0210 b/test/stdout/0210
index 2eedebd91..6a2f71d6c 100644
--- a/test/stdout/0210
+++ b/test/stdout/0210
@@ -14,9 +14,9 @@ DATA
 345 Send it
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
diff --git a/test/stdout/0215 b/test/stdout/0215
index d6d06cfe6..a4a9b8639 100644
--- a/test/stdout/0215
+++ b/test/stdout/0215
@@ -18,9 +18,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -53,9 +53,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -93,9 +93,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -140,9 +140,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -173,9 +173,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -205,9 +205,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
diff --git a/test/stdout/0217 b/test/stdout/0217
index be5634b31..662e156fb 100644
--- a/test/stdout/0217
+++ b/test/stdout/0217
@@ -21,9 +21,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -310,9 +310,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbP-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbP-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0218 b/test/stdout/0218
index c7f853fc5..d26e24f48 100644
--- a/test/stdout/0218
+++ b/test/stdout/0218
@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for a@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 .
@@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for b@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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 .
@@ -82,9 +82,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
 	for c@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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 3
 .
diff --git a/test/stdout/0231 b/test/stdout/0231
index f74359cac..bd6eb49d8 100644
--- a/test/stdout/0231
+++ b/test/stdout/0231
@@ -20,15 +20,15 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From:     a@test.ex, b@test.ex, a-rewrite@domain2,
 	b-rewrite@domain2, a@domain3, b@domain3
 To:       a@test.ex, b@test.ex, a-other@domain2,
 	b-other@domain2, a@domain3, b@domain3
 Reply-to: a@test.ex, b@test.ex, a-other@domain2,
 	b-other@domain2, a@domain3, b@domain3
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0242 b/test/stdout/0242
index 7dc9a2e1b..dbcbe94d9 100644
--- a/test/stdout/0242
+++ b/test/stdout/0242
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -40,10 +40,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000
-Subject: Test message
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Subject: Test message
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0245 b/test/stdout/0245
index 36332a61b..9bd0dfc25 100644
--- a/test/stdout/0245
+++ b/test/stdout/0245
@@ -26,9 +26,9 @@ aaa@bbb
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 036T To: <"abc
    def"@test.ex>, xxx@yyy
 ddd* Bcc: aaa@bbb    
-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0250 b/test/stdout/0250
index 1d364b4e9..310f57896 100644
--- a/test/stdout/0250
+++ b/test/stdout/0250
@@ -20,14 +20,14 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER-rewritten@test.ex>)
 	id 10HmaX-0005vi-00
 	for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 ddd* From: userx@test.ex
 dddF From: userx-rewritten@test.ex
-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 ddd* X-rewrote-original-recipient: SomeOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaY-0005vi-00-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
@@ -50,14 +50,14 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER-rewritten@test.ex>)
 	id 10HmaY-0005vi-00
 	for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 ddd* From: usery@test.ex
 dddF From: usery-rewritten@test.ex
-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 ddd* X-rewrote-original-recipient: OtherOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
@@ -80,9 +80,9 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER-rewritten@test.ex>)
 	id 10HmaZ-0005vi-00
 	for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 ddd* X-rewrote-original-recipient: ThirdOne@test.ex
 ddd* From: CALLER_NAME <CALLER@test.ex>
 dddF From: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0253 b/test/stdout/0253
index e289e817f..5165278db 100644
--- a/test/stdout/0253
+++ b/test/stdout/0253
@@ -16,9 +16,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <pqr@x.y.z>)
 	id 10HmaZ-0005vi-00; 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>
 From: pqr@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3
 .
@@ -42,9 +42,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <pqr@x.y.z>)
 	id 10HmaZ-0005vi-00; 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>
 From: pqr@x.y.z
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3
 .
diff --git a/test/stdout/0254 b/test/stdout/0254
index 947c4e0c5..3e044dd6f 100644
--- a/test/stdout/0254
+++ b/test/stdout/0254
@@ -20,6 +20,7 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* To: t
@@ -32,7 +33,6 @@ ddd* Resent-To: t
 028T Resent-To: t@myhost.test.ex
 015  Resent-Date: d
 033  Resent-Subject: should not exist
-054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID
@@ -56,13 +56,13 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* Resent-From: f
 dddF Resent-From: f@myhost.test.ex
-054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
-045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>
@@ -85,6 +85,8 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 ddd* From: userx
 dddF From: userx@myhost.test.ex
 ddd* To: xx@yy
@@ -93,6 +95,4 @@ ddd* Resent-From: userx
 dddF Resent-From: userx@myhost.test.ex
 ddd* Resent-To: xx@yy
 021T Resent-To: xxxx@yyyy
-054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
-045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0285 b/test/stdout/0285
index 37a681a08..84ba5b550 100644
--- a/test/stdout/0285
+++ b/test/stdout/0285
@@ -17,9 +17,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -42,9 +42,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -68,9 +68,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -93,9 +93,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -119,9 +119,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0286 b/test/stdout/0286
index 993817efa..e65518e57 100644
--- a/test/stdout/0286
+++ b/test/stdout/0286
@@ -17,9 +17,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -47,9 +47,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -62,9 +62,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -96,9 +96,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -130,9 +130,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0288 b/test/stdout/0288
index 8f36a023d..5c1cf83e0 100644
--- a/test/stdout/0288
+++ b/test/stdout/0288
@@ -16,9 +16,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0299 b/test/stdout/0299
index 798f402e6..7f74352b9 100644
--- a/test/stdout/0299
+++ b/test/stdout/0299
@@ -17,9 +17,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -32,9 +32,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0311 b/test/stdout/0311
index 45190072f..8641c1a6c 100644
--- a/test/stdout/0311
+++ b/test/stdout/0311
@@ -20,12 +20,12 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 ddd* return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q
-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaY-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>
@@ -48,9 +48,9 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 017  return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q
-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0332 b/test/stdout/0332
index d1593fa4e..91787967f 100644
--- a/test/stdout/0332
+++ b/test/stdout/0332
@@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 .
@@ -33,9 +33,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 .
diff --git a/test/stdout/0333 b/test/stdout/0333
index d1593fa4e..91787967f 100644
--- a/test/stdout/0333
+++ b/test/stdout/0333
@@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 .
@@ -33,9 +33,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 .
diff --git a/test/stdout/0338 b/test/stdout/0338
index a97751353..ca25c66ff 100644
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -25,6 +25,6 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0363 b/test/stdout/0363
index a3160693f..44397685a 100644
--- a/test/stdout/0363
+++ b/test/stdout/0363
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for Aa%Bb@Cc; Tue, 2 Mar 1999 09:44:33 +0000
-To: aa%bb@cc
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+To: aa%bb@cc
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0367 b/test/stdout/0367
index b54aff8ff..6036dac9a 100644
--- a/test/stdout/0367
+++ b/test/stdout/0367
@@ -16,9 +16,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1
 .
@@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
 	for userx@domain1; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 4
 .
@@ -50,9 +50,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@domain1; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3
 .
@@ -67,9 +67,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@domain1; 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>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 2
 .
diff --git a/test/stdout/0374 b/test/stdout/0374
index f9844eb3b..7b3bd443d 100644
--- a/test/stdout/0374
+++ b/test/stdout/0374
@@ -14,9 +14,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0375 b/test/stdout/0375
index 6e0080d5b..5555ddb0d 100644
--- a/test/stdout/0375
+++ b/test/stdout/0375
@@ -14,9 +14,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -73,9 +73,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0377 b/test/stdout/0377
index 59742e666..5e3c1dd4e 100644
--- a/test/stdout/0377
+++ b/test/stdout/0377
@@ -22,6 +22,6 @@ cccc@myhost.test.ex
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0378 b/test/stdout/0378
index e64fdef16..39d447a45 100644
--- a/test/stdout/0378
+++ b/test/stdout/0378
@@ -21,6 +21,6 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0379 b/test/stdout/0379
index 7bfea116f..d19ba85a1 100644
--- a/test/stdout/0379
+++ b/test/stdout/0379
@@ -21,6 +21,6 @@ aaaa@myhost.test.ex
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0389 b/test/stdout/0389
index 69b1bfc00..e3e357dd2 100644
--- a/test/stdout/0389
+++ b/test/stdout/0389
@@ -27,6 +27,6 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0431 b/test/stdout/0431
index 5e17ec9d6..49a01f003 100644
--- a/test/stdout/0431
+++ b/test/stdout/0431
@@ -16,9 +16,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -41,9 +41,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0440 b/test/stdout/0440
index 7433e27b4..095cf71fc 100644
--- a/test/stdout/0440
+++ b/test/stdout/0440
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x1@y1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 First message
 .
@@ -32,9 +32,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for x3@y3; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Third message
 .
@@ -49,9 +49,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for x2@y2; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second message
 .
diff --git a/test/stdout/0461 b/test/stdout/0461
index 16c0f34e6..2b6000e3f 100644
--- a/test/stdout/0461
+++ b/test/stdout/0461
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
 .
@@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
 .
@@ -65,9 +65,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.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.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Short message
 .
diff --git a/test/stdout/0467 b/test/stdout/0467
index 553dda850..9610b5dd0 100644
--- a/test/stdout/0467
+++ b/test/stdout/0467
@@ -34,9 +34,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for x@srv27.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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0474 b/test/stdout/0474
index ee42c1e32..3b852fea2 100644
--- a/test/stdout/0474
+++ b/test/stdout/0474
@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaX-0005vi-00
 	for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test data.
 .
diff --git a/test/stdout/0488 b/test/stdout/0488
index ff89ff2f7..4f7635181 100644
--- a/test/stdout/0488
+++ b/test/stdout/0488
@@ -25,9 +25,9 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 011  X-1: first
 012  X-2: second
 011  X-3: third
diff --git a/test/stdout/0490 b/test/stdout/0490
index f9cb83d19..b9d5d3762 100644
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -29,6 +29,6 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for bb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0495 b/test/stdout/0495
index 35df989f5..874b217fb 100644
--- a/test/stdout/0495
+++ b/test/stdout/0495
@@ -39,9 +39,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This should succeed
 .
@@ -113,9 +113,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This should succeed (alias to normal address)
 .
@@ -140,9 +140,9 @@ Received: from CALLER (helo=a.b)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <sen@der>)
 	id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 From: sen@der
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This should succeed.
 .
diff --git a/test/stdout/0497 b/test/stdout/0497
index 3462fd1b3..7d078592e 100644
--- a/test/stdout/0497
+++ b/test/stdout/0497
@@ -61,9 +61,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
 	for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 452 temporary error
@@ -129,9 +129,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbL-0005vi-00
 	for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbL-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 452 temporary error
diff --git a/test/stdout/0498 b/test/stdout/0498
index f1448ba45..deedca63a 100644
--- a/test/stdout/0498
+++ b/test/stdout/0498
@@ -30,9 +30,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 *sleep 2
diff --git a/test/stdout/0514 b/test/stdout/0514
index 83111ea92..82f8ca6e5 100644
--- a/test/stdout/0514
+++ b/test/stdout/0514
@@ -23,6 +23,6 @@ dddP Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <"spaced user"@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <"spaced user"@myhost.test.ex>
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0531 b/test/stdout/0531
index 01438bd35..b6fb54437 100644
--- a/test/stdout/0531
+++ b/test/stdout/0531
@@ -17,9 +17,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -44,9 +44,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@retry.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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -70,9 +70,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@retry.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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
diff --git a/test/stdout/0542 b/test/stdout/0542
index ab29dc9c0..6a860f0d9 100644
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -30,11 +30,11 @@
 > message_body_linecount=2
 > max_received_linelength=50
 > headers -----------------
-> From: A Person <a.person@a.domain.tld>
+> Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: A Person <a.person@a.domain.tld>
 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 > 
 > body --------------------
 > And now we have the body of the message, containing a small number of lines. 
diff --git a/test/stdout/0543 b/test/stdout/0543
index 6b6a6067f..b14cfff77 100644
--- a/test/stdout/0543
+++ b/test/stdout/0543
@@ -31,9 +31,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1
 .
diff --git a/test/stdout/0554 b/test/stdout/0554
index 8c0cfea8a..c00390d90 100644
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -31,9 +31,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/0560 b/test/stdout/0560
index 45a84cf13..e2893572e 100644
--- a/test/stdout/0560
+++ b/test/stdout/0560
@@ -2,12 +2,12 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.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.test.ex>
 From: Somebody <abcd@x.y.z>
 To: first@test.ex
     another@another.ex
 Subject: Testing -Mvc
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message of no great importance.
diff --git a/test/stdout/2021 b/test/stdout/2021
index fad916638..dbed47175 100644
--- a/test/stdout/2021
+++ b/test/stdout/2021
@@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/3401 b/test/stdout/3401
index fda6814c5..66b1dd316 100644
--- a/test/stdout/3401
+++ b/test/stdout/3401
@@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -51,9 +51,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -79,9 +79,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -141,9 +141,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00
 	for forcesender@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
@@ -189,9 +189,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbI-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/3404 b/test/stdout/3404
index c78436c71..90c228e79 100644
--- a/test/stdout/3404
+++ b/test/stdout/3404
@@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-AID: >CALLER<
 
 .
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-AID: >zzz<
 
 .
@@ -81,9 +81,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
 	for userx@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-AID: >CALLER<
 
 .
diff --git a/test/stdout/3405 b/test/stdout/3405
index 6020e0591..15782630d 100644
--- a/test/stdout/3405
+++ b/test/stdout/3405
@@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-AID: >CALLER<
 X-TAID: >CALLER<
 
@@ -49,9 +49,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-AID: >CALLER<
 X-TAID: >CALLER<
 
diff --git a/test/stdout/3412 b/test/stdout/3412
index b7c7a379f..7511f43fb 100644
--- a/test/stdout/3412
+++ b/test/stdout/3412
@@ -18,13 +18,13 @@ DATA
 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
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: x@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -41,9 +41,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x@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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/3415 b/test/stdout/3415
index 7bbd8061e..7adb9f6f6 100644
--- a/test/stdout/3415
+++ b/test/stdout/3415
@@ -165,10 +165,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	(envelope-from <username@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: a@y
 dddS Sender: username@myhost.test.ex
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaY-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
@@ -190,9 +190,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: username@myhost.test.ex
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
@@ -214,9 +214,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	id 10HmaZ-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 dddF From: username@another.domain
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
@@ -238,9 +238,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 dddF From: username@auth.id.domain
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 10HmbB-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
@@ -262,7 +262,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	id 10HmbB-0005vi-00
 	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-dddF From: abc@x.y.z
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+dddF From: abc@x.y.z
 dddS Sender: username@auth.id.domain
-038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3501 b/test/stdout/3501
index e29d425ff..aec3f5def 100644
--- a/test/stdout/3501
+++ b/test/stdout/3501
@@ -21,9 +21,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 250 OK
diff --git a/test/stdout/5102 b/test/stdout/5102
index 372019227..c0054572e 100644
--- a/test/stdout/5102
+++ b/test/stdout/5102
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .
@@ -69,9 +69,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 .
diff --git a/test/stdout/9900 b/test/stdout/9900
index 129eb3ce5..98701f9a2 100644
--- a/test/stdout/9900
+++ b/test/stdout/9900
@@ -24,9 +24,9 @@ Received: from CALLER by myhost.text.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@mx46cd.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.text.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 First message
 .
@@ -50,9 +50,9 @@ Received: from CALLER by myhost.text.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@mx46cd.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.text.ex>
 From: CALLER_NAME <CALLER@test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second message
 .