Use separate line in Received: header for timestamp

609 files changed, 2982 insertions, 1554 deletions

diff --git a/src/src/receive.c b/src/src/receive.c
index ce7da5719..b0dacbd68 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -492,7 +492,7 @@ if (recipients_count >= recipients_list_max)
   int oldmax = recipients_list_max;
   recipients_list_max = recipients_list_max ? 2*recipients_list_max : 50;
   recipients_list = store_get(recipients_list_max * sizeof(recipient_item), FALSE);
-  if (oldlist != NULL)
+  if (oldlist)
     memcpy(recipients_list, oldlist, oldmax * sizeof(recipient_item));
   }
 
@@ -1516,11 +1516,10 @@ return TRUE;
 void
 received_header_gen(void)
 {
-uschar *received;
-uschar *timestamp;
-header_line *received_header= header_list;
+uschar * received;
+uschar * timestamp = expand_string(US"${tod_full}");
+header_line * received_header= header_list;
 
-timestamp = expand_string(US"${tod_full}");
 if (recipients_count == 1) received_for = recipients_list[0].address;
 received = expand_string(received_header_text);
 received_for = NULL;
@@ -1539,14 +1538,14 @@ so all we have to do is fill in the text pointer, and set the type. However, if
 the result of the expansion is an empty string, we leave the header marked as
 "old" so as to refrain from adding a Received header. */
 
-if (received[0] == 0)
+if (!received[0])
   {
   received_header->text = string_sprintf("Received: ; %s\n", timestamp);
   received_header->type = htype_old;
   }
 else
   {
-  received_header->text = string_sprintf("%s; %s\n", received, timestamp);
+  received_header->text = string_sprintf("%s;\n\t%s\n", received, timestamp);
   received_header->type = htype_received;
   }
 
diff --git a/test/confs/0420 b/test/confs/0420
index a115c7249..734b1237e 100644
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -10,7 +10,7 @@ qualify_domain = test.ex
 
 queue_only
 acl_smtp_rcpt = accept
-acl_smtp_data =	accept logwrite = h: <$h_Received:>
+acl_smtp_data =	accept logwrite = ${quote:h: <$h_Received:>}
 
 received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}
 
diff --git a/test/log/0420 b/test/log/0420
index d7b5c44f8..ae4dfda31 100644
--- a/test/log/0420
+++ b/test/log/0420
@@ -1,7 +1,7 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 h: <>
+1999-03-02 09:44:33 10HmaX-0005vi-00 "h: <>"
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(client.test.ex) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 h: <some text; Tue, 2 Mar 1999 09:44:33 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 "h: <some text;\n	Tue, 2 Mar 1999 09:44:33 +0000>"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@b H=(client.test.ex) [127.0.0.1] P=smtp S=sss
diff --git a/test/log/5100 b/test/log/5100
index 5c4f5ce46..86c3864bb 100644
--- a/test/log/5100
+++ b/test/log/5100
@@ -71,7 +71,8 @@ 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
+<<< 	id 10HmbD-0005vi-00;
+<<< 	Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 05
 <<< Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -128,7 +129,8 @@ 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
+<<< 	id 10HmbF-0005vi-00;
+<<< 	Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 06
 <<< Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -201,7 +203,8 @@ 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
+<<< 	id 10HmbI-0005vi-00;
+<<< 	Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 08
 <<< Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -239,7 +242,8 @@ 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
+<<< 	id 10HmbJ-0005vi-00;
+<<< 	Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 09
 <<< Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/log/5101 b/test/log/5101
index 5c1ba43ff..ab1ba38b9 100644
--- a/test/log/5101
+++ b/test/log/5101
@@ -22,7 +22,8 @@ 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
+<<< 	id 10HmaX-0005vi-00;
+<<< 	Tue, 2 Mar 1999 09:44:33 +0000
 <<< mailbox: copied
 <<< Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -68,7 +69,8 @@ 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
+<<< 	id 10HmaZ-0005vi-00;
+<<< 	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/0005.CALLER b/test/mail/0005.CALLER
index 1b73cc347..cde2b58c5 100644
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -5,14 +5,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for CALLER@the.local.host.name;
+	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
-X-message-linecount: 11
+X-message-linecount: 12
 X-received-count: 1
 
 This is a test message.
@@ -26,7 +27,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second
 Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>
 From: someone@some.domain
@@ -34,7 +36,7 @@ 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
-X-message-linecount: 10
+X-message-linecount: 11
 X-received-count: 1
 
 This is a second test message.
@@ -46,7 +48,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third
 Reply-to: some@body
 Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>
@@ -55,7 +58,7 @@ 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
-X-message-linecount: 11
+X-message-linecount: 12
 X-received-count: 1
 
 This is a third test message.
diff --git a/test/mail/0006.CALLER b/test/mail/0006.CALLER
index 627bc16bc..56065ecf5 100644
--- a/test/mail/0006.CALLER
+++ b/test/mail/0006.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@the.local.host.name
 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
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From:<someone@some.where>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
@@ -14,7 +15,8 @@ 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)
 	(envelope-from <someone@some.where>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From:<someone@some.where>
 To: Recipients not given:;
 X-Test: (íåìù ïá éìèôð)
@@ -24,7 +26,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 Raw Message Headers:
 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
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From:<someone@some.where>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
diff --git a/test/mail/0008.CALLER b/test/mail/0008.CALLER
index 0a54f1f4d..68dcdad8c 100644
--- a/test/mail/0008.CALLER
+++ b/test/mail/0008.CALLER
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
diff --git a/test/mail/0009.CALLER b/test/mail/0009.CALLER
index b4806a18d..48615d5cf 100644
--- a/test/mail/0009.CALLER
+++ b/test/mail/0009.CALLER
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
diff --git a/test/mail/0010.CALLER b/test/mail/0010.CALLER
index b4806a18d..48615d5cf 100644
--- a/test/mail/0010.CALLER
+++ b/test/mail/0010.CALLER
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
diff --git a/test/mail/0011.CALLER b/test/mail/0011.CALLER
index b4806a18d..48615d5cf 100644
--- a/test/mail/0011.CALLER
+++ b/test/mail/0011.CALLER
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
diff --git a/test/mail/0014.userx b/test/mail/0014.userx
index 8844387dc..49dd995f9 100644
--- a/test/mail/0014.userx
+++ b/test/mail/0014.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: aaa@bbb
 To: userx@myhost.test.ex, 1=x@zzery.query
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -12,7 +13,8 @@ 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
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: J.Caesar@plc.example
 To: userx@myhost.test.ex, J.Caesar@plc.example,
   J.Calendar@plc.example,
diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index e01024b97..4853cf7f3 100644
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -46,7 +47,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 10HmaX-0005vi-00
-	for page+userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for page+userx@test.ex;
+	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
@@ -61,7 +63,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -104,7 +107,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 10HmbA-0005vi-00
-	for page+ux@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for page+ux@test.ex;
+	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
diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 870f58015..7bedcda23 100644
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for page+userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for page+userx@test.ex;
+	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
@@ -21,7 +22,8 @@ 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 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
@@ -42,7 +44,8 @@ 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 10HmbA-0005vi-00
-	for page+ux@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for page+ux@test.ex;
+	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
@@ -58,7 +61,8 @@ 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 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
@@ -81,7 +85,8 @@ 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 10HmbD-0005vi-00
-	for B+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for B+userx@Test.Ex;
+	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
@@ -99,7 +104,8 @@ Envelope-to: userx-B@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)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbF-0005vi-00;
+	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
@@ -116,7 +122,8 @@ Envelope-to: X+userx-B@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)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbF-0005vi-00;
+	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
diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 5889f68ed..c670525fc 100644
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx+page@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx+page@test.ex;
+	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
@@ -21,7 +22,8 @@ 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 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
diff --git a/test/mail/0021.CALLER b/test/mail/0021.CALLER
index cac7613b3..e5cb553a3 100644
--- a/test/mail/0021.CALLER
+++ b/test/mail/0021.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbM-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 2691df465..18e579398 100644
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -1,7 +1,8 @@
 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 ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
+	for ok@test2;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: ok@test2
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -30,7 +32,8 @@ Test message 3.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbH-0005vi-00
-	for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
+	for ok@test4;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
@@ -49,7 +52,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: ok@test4
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index ee2f5a849..791bbc63d 100644
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,7 +1,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 userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test1;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -31,7 +33,8 @@ From ok@test1 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test1>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +45,8 @@ From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test3>)
 	id 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +56,8 @@ Test message 4.
 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
+	for userx@test1;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
@@ -69,7 +74,8 @@ checks incoming messages on this system. The following error was given:
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbK-0005vi-00
-	for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test1;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
@@ -89,7 +95,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0021.x b/test/mail/0021.x
index 8e8b1256d..ea2d7a44e 100644
--- a/test/mail/0021.x
+++ b/test/mail/0021.x
@@ -3,7 +3,8 @@ Received: from [10.9.8.8] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <ok@test3>)
 	id 10HmbI-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: added header line
 
 Some message
@@ -13,7 +14,8 @@ Received: from [10.9.8.8] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <ok@test3>)
 	id 10HmbL-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: added header line
 
 Some message
diff --git a/test/mail/0023.cond- b/test/mail/0023.cond-
index 84b3bd601..da5322b29 100644
--- a/test/mail/0023.cond-
+++ b/test/mail/0023.cond-
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbF-0005vi-00
-	for cond-@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond--1 b/test/mail/0023.cond--1
index ef08691a3..334186fff 100644
--- a/test/mail/0023.cond--1
+++ b/test/mail/0023.cond--1
@@ -3,7 +3,8 @@ Received: from [56.56.57.57] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbL-0005vi-00
-	for cond--1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond--1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond-0 b/test/mail/0023.cond-0
index 578a30fe8..8b99af1f9 100644
--- a/test/mail/0023.cond-0
+++ b/test/mail/0023.cond-0
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbH-0005vi-00
-	for cond-0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-0@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond-00 b/test/mail/0023.cond-00
index 5a8732ddb..c84870654 100644
--- a/test/mail/0023.cond-00
+++ b/test/mail/0023.cond-00
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbI-0005vi-00
-	for cond-00@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-00@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond-1 b/test/mail/0023.cond-1
index cd5169222..d5ebc3646 100644
--- a/test/mail/0023.cond-1
+++ b/test/mail/0023.cond-1
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbB-0005vi-00
-	for cond-1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-1
 X-message-body-size: 0
 
diff --git a/test/mail/0023.cond-10 b/test/mail/0023.cond-10
index 62731a3c8..7bc0533b7 100644
--- a/test/mail/0023.cond-10
+++ b/test/mail/0023.cond-10
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbC-0005vi-00
-	for cond-10@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-10@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-10
 X-message-body-size: 0
 
diff --git a/test/mail/0023.cond-false b/test/mail/0023.cond-false
index 68118093c..05fdd3f5b 100644
--- a/test/mail/0023.cond-false
+++ b/test/mail/0023.cond-false
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbJ-0005vi-00
-	for cond-false@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-false@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond-no b/test/mail/0023.cond-no
index f544bb833..eb22c8e26 100644
--- a/test/mail/0023.cond-no
+++ b/test/mail/0023.cond-no
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbG-0005vi-00
-	for cond-no@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-no@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond-rhubarb b/test/mail/0023.cond-rhubarb
index 798c40f0e..030ca9d6e 100644
--- a/test/mail/0023.cond-rhubarb
+++ b/test/mail/0023.cond-rhubarb
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbE-0005vi-00
-	for cond-rhubarb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-rhubarb@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
@@ -12,7 +13,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbM-0005vi-00
-	for cond-rhubarb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-rhubarb@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.cond-true b/test/mail/0023.cond-true
index 5bd91d395..7e8241495 100644
--- a/test/mail/0023.cond-true
+++ b/test/mail/0023.cond-true
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbD-0005vi-00
-	for cond-true@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-true@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-true
 X-message-body-size: 0
 
diff --git a/test/mail/0023.cond-yes b/test/mail/0023.cond-yes
index 94fb12aa6..967ff7ce3 100644
--- a/test/mail/0023.cond-yes
+++ b/test/mail/0023.cond-yes
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbA-0005vi-00
-	for cond-yes@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-yes@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-yes
 X-message-body-size: 0
 
@@ -13,7 +14,8 @@ Received: from [56.56.57.57] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbK-0005vi-00
-	for cond-yes@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for cond-yes@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0
 
 
diff --git a/test/mail/0023.okbatch b/test/mail/0023.okbatch
index 16b2f7388..700461cc7 100644
--- a/test/mail/0023.okbatch
+++ b/test/mail/0023.okbatch
@@ -5,7 +5,8 @@ Envelope-to: ok1@test.ex,
 Received: from [56.56.58.58] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <rcpttest@test.ex>)
-	id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbN-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 xx: rcpt_count = 1
     rcpt_defer_count = 0
     rcpt_fail_count  = 0
diff --git a/test/mail/0023.userx b/test/mail/0023.userx
index f97a3f973..02a958b00 100644
--- a/test/mail/0023.userx
+++ b/test/mail/0023.userx
@@ -3,7 +3,8 @@ Received: from [32.32.32.32] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Start: domain=test.ex local_part=userx
 Vr: domain=test.ex local_part=userx
 X-message-body-size: 28
@@ -15,7 +16,8 @@ Received: from [55.55.55.55] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-rcpt-added: An added header at RCPT time
 X-data-added: Header added at data time
 X-message-body-size: 24
diff --git a/test/mail/0023.userx-vs b/test/mail/0023.userx-vs
index dc818645e..d5e8cd1ed 100644
--- a/test/mail/0023.userx-vs
+++ b/test/mail/0023.userx-vs
@@ -3,7 +3,8 @@ Received: from [32.32.32.32] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx-vs@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx-vs@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Start: domain=test.ex local_part=userx-vs
 Vs: domain=test.ex local_part=userx-vs
 Vr: domain=test.ex local_part=userx-vs
diff --git a/test/mail/0024.postmaster b/test/mail/0024.postmaster
index e438fc3bb..ea1c5d5d4 100644
--- a/test/mail/0024.postmaster
+++ b/test/mail/0024.postmaster
@@ -3,7 +3,8 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
@@ -11,7 +12,8 @@ From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [V4NET.0.0.0] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
@@ -20,7 +22,8 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmbA-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 4
 
@@ -28,7 +31,8 @@ From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [V4NET.11.12.16] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.16 is in a black list at rbl2.test.ex (127.0.0.2)
 
 Message 5
diff --git a/test/mail/0024.userx b/test/mail/0024.userx
index 7775103f0..d4b2247a3 100644
--- a/test/mail/0024.userx
+++ b/test/mail/0024.userx
@@ -2,7 +2,8 @@ From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [V4NET.0.0.0] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
@@ -10,7 +11,8 @@ From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [V4NET.11.12.16] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.16 is in a black list at rbl2.test.ex (127.0.0.2)
 
 Message 5
diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index 791683ab7..a845d2ddd 100644
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -1,7 +1,8 @@
 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
+	id 10HmaX-0005vi-00;
+	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/0026.userx b/test/mail/0026.userx
index 67c1c0803..21b9abc15 100644
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -2,7 +2,8 @@ From x@y Tue Mar 02 09:44:33 1999
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ From x@y Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
@@ -27,7 +29,8 @@ Message 10
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmbH-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex
diff --git a/test/mail/0031.CALLER b/test/mail/0031.CALLER
index d996dc047..ab6a3ec5e 100644
--- a/test/mail/0031.CALLER
+++ b/test/mail/0031.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@one.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@one.test.ex;
+	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
diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 3551d5753..ef3e2dde6 100644
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@some.where>
@@ -43,7 +44,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for userx@mxt1.test.ex;
+	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
diff --git a/test/mail/0036.abcd b/test/mail/0036.abcd
index 1c9503859..affc03f54 100644
--- a/test/mail/0036.abcd
+++ b/test/mail/0036.abcd
@@ -2,10 +2,12 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0036.userx b/test/mail/0036.userx
index 1c9503859..affc03f54 100644
--- a/test/mail/0036.userx
+++ b/test/mail/0036.userx
@@ -2,10 +2,12 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 7555bd656..cd2df0d31 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@test.ex,
   abcd@test.ex,
   userx@test.ex
@@ -56,7 +57,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should fail this
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -73,7 +75,8 @@ Envelope-to: CALLER@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
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
@@ -91,7 +94,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -130,7 +134,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 10HmbE-0005vi-00
-	for filter-pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-pipe@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (1)
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -146,7 +151,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-file@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -185,7 +191,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 10HmbG-0005vi-00
-	for filter-file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-file@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (2)
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -201,7 +208,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbJ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-lookup@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -240,7 +248,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 10HmbI-0005vi-00
-	for filter-lookup@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-lookup@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (3)
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -256,7 +265,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbL-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-exists@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -295,7 +305,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 10HmbK-0005vi-00
-	for filter-exists@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-exists@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (4)
 Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -311,7 +322,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbN-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -350,7 +362,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 10HmbM-0005vi-00
-	for filter-readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-readfile@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (5)
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -366,7 +379,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbP-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-run@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -405,7 +419,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 10HmbO-0005vi-00
-	for filter-run@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-run@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (6)
 Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -421,7 +436,8 @@ Envelope-to: CALLER@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 10HmbR-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 Subject: On vacation
 In-Reply-To: <E10HmbQ-0005vi-00@the.local.host.name>
@@ -439,7 +455,8 @@ Envelope-to: CALLER@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 10HmbT-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 Subject: On vacation
 In-Reply-To: <E10HmbS-0005vi-00@the.local.host.name>
@@ -457,7 +474,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbX-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -496,7 +514,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 10HmbW-0005vi-00
-	for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for readfile@test.ex;
+	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
@@ -512,7 +531,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmcD-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-stat@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -551,7 +571,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 10HmcC-0005vi-00
-	for filter-stat@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-stat@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (7)
 Message-Id: <E10HmcC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -567,7 +588,8 @@ Envelope-to: CALLER@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 10HmcF-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 Subject: Re: Very long ... xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 In-Reply-To: <E10HmcE-0005vi-00@the.local.host.name>
diff --git a/test/mail/0037.dff b/test/mail/0037.dff
index 1a0754526..ec5e93fee 100644
--- a/test/mail/0037.dff
+++ b/test/mail/0037.dff
@@ -5,7 +5,8 @@ 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 10HmbY-0005vi-00
-	for deliverfromfilter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for deliverfromfilter@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbY-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/0037.postmaster b/test/mail/0037.postmaster
index 0a789cf28..bb3dfd9c4 100644
--- a/test/mail/0037.postmaster
+++ b/test/mail/0037.postmaster
@@ -4,7 +4,8 @@ Envelope-to: postmaster@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -28,7 +29,8 @@ Envelope-to: postmaster@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbV-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
diff --git a/test/mail/0037.userx b/test/mail/0037.userx
index d2169198b..37c53d200 100644
--- a/test/mail/0037.userx
+++ b/test/mail/0037.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test 1
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -20,7 +21,8 @@ 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 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -36,7 +38,8 @@ 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 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -53,7 +56,8 @@ 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 10HmbU-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -70,7 +74,8 @@ 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 10HmbZ-0005vi-00
-	for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbZ-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/0037.userz b/test/mail/0037.userz
index 9aafa6f61..d6a2da9f0 100644
--- a/test/mail/0037.userz
+++ b/test/mail/0037.userz
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test 1
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -19,7 +20,8 @@ Envelope-to: system-filter
 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
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should fail this
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -35,7 +37,8 @@ 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 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -51,7 +54,8 @@ 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 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -67,7 +71,8 @@ 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 10HmbU-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -83,7 +88,8 @@ 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 10HmbW-0005vi-00
-	for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for readfile@test.ex;
+	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
@@ -98,7 +104,8 @@ 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 10HmcA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should defer this
 Message-Id: <E10HmcA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0040.userx b/test/mail/0040.userx
index 35eb5b5fe..1bc03d810 100644
--- a/test/mail/0040.userx
+++ b/test/mail/0040.userx
@@ -6,7 +6,8 @@ Received: from forum.rome ([1.1.1.1] ident=jc44bc)
 	by the.local.host.name with latin (Exim x.yz)
 	(envelope-from <jc@rome>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-interface: 2.2.2.2
 
 This is a test message.
@@ -18,7 +19,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from jc44bc by the.local.host.name with local (Exim x.yz)
 	(envelope-from <jc@rome>)
 	id 10HmaY-0005vi-00
-	for userx@test.x; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.x;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: Julius Caesar <jc@rome>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index f457b8408..36cdf8e54 100644
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -62,7 +63,8 @@ USER=pipe
 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
+	for pipe@test.ex;
+	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
@@ -87,7 +89,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 10HmaX-0005vi-00
-	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe@test.ex;
+	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
@@ -102,7 +105,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: prefixed+pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -160,7 +164,8 @@ USER=pipe
 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
+	for prefixed+pipe@test.ex;
+	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
@@ -185,7 +190,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
-	for prefixed+pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for prefixed+pipe@test.ex;
+	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
@@ -200,7 +206,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -258,7 +265,8 @@ USER=pipe
 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
+	for pipe-suffixed@test.ex;
+	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
@@ -283,7 +291,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 10HmbB-0005vi-00
-	for pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe-suffixed@test.ex;
+	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
@@ -298,7 +307,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbE-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: prefixed+pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -356,7 +366,8 @@ USER=pipe
 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
+	for prefixed+pipe-suffixed@test.ex;
+	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
@@ -381,7 +392,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 10HmbD-0005vi-00
-	for prefixed+pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for prefixed+pipe-suffixed@test.ex;
+	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
@@ -396,7 +408,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbG-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -454,7 +467,8 @@ USER=pipe
 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
+	for pipe@test.ex;
+	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
@@ -479,7 +493,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 10HmbF-0005vi-00
-	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe@test.ex;
+	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
diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index c6e4b19f9..cb34feac9 100644
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -33,7 +35,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -47,7 +50,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -61,7 +65,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -75,7 +80,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@some.where>
 Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
@@ -90,7 +96,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@some.where>
 Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
@@ -105,7 +112,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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>
 Sender: CALLER_NAME <CALLER@myhost.ex>
@@ -120,7 +128,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@some.where>
 Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
@@ -135,7 +144,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@some.where>
 Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index 4d209dcd1..bcc824b53 100644
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
@@ -20,7 +21,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 From: userx@outside.ex
@@ -35,7 +37,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 From: userx@outside.ex
@@ -50,7 +53,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@elsewhere.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: userx@elsewhere.ex
@@ -65,7 +69,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 From: userx@cus.cam.ac.uk
@@ -80,7 +85,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbC-0005vi-00@myhost.ex>
@@ -95,7 +101,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
 	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbD-0005vi-00@myhost.ex>
@@ -110,7 +117,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -124,7 +132,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@outside.ex>)
 	id 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbF-0005vi-00@myhost.ex>
@@ -139,7 +148,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <userx@elsewhere.ex>)
 	id 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbG-0005vi-00@myhost.ex>
@@ -154,7 +164,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbH-0005vi-00@myhost.ex>
diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index d7931d7c2..040163e37 100644
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@bad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
@@ -43,7 +44,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for userx@bad.ex;
+	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
@@ -58,7 +60,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@badbad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
@@ -97,7 +100,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for userx@badbad.ex;
+	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
@@ -112,7 +116,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain4.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
@@ -151,7 +156,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for userx@domain4.ex;
+	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
@@ -166,7 +172,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain2.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
@@ -205,7 +212,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for userx@domain2.ex;
+	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
diff --git a/test/mail/0051.userx b/test/mail/0051.userx
index 7e0caa91c..473dc3deb 100644
--- a/test/mail/0051.userx
+++ b/test/mail/0051.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbC-0005vi-00
-	for userx@domain1.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1.ex;
+	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
@@ -33,7 +35,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbH-0005vi-00
-	for userx@xx.domain5.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@xx.domain5.ex;
+	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
@@ -47,7 +50,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbI-0005vi-00
-	for userx@domain6.yy.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain6.yy.ex;
+	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
diff --git a/test/mail/0052.!one b/test/mail/0052.!one
index 9e4c91494..930765c46 100644
--- a/test/mail/0052.!one
+++ b/test/mail/0052.!one
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
-	for !one@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for !one@test.ex;
+	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/0052.CALLER b/test/mail/0052.CALLER
index 3a2ee9350..427027f68 100644
--- a/test/mail/0052.CALLER
+++ b/test/mail/0052.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: xx99@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
@@ -43,7 +44,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for xx99@test.ex;
+	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
@@ -58,7 +60,8 @@ Envelope-to: CALLER@myhost.ex
 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
+	for CALLER@myhost.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: !two@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
@@ -97,7 +100,8 @@ Return-path: <CALLER@myhost.ex>
 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
+	for !two@test.ex;
+	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
diff --git a/test/mail/0052.yy99 b/test/mail/0052.yy99
index 1ebddcbe9..9f0e376ce 100644
--- a/test/mail/0052.yy99
+++ b/test/mail/0052.yy99
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaZ-0005vi-00
-	for yy99@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for yy99@test.ex;
+	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
diff --git a/test/mail/0055.userx b/test/mail/0055.userx
index d31bc4ab2..0ef68b429 100644
--- a/test/mail/0055.userx
+++ b/test/mail/0055.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
-	for userx@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.ex;
+	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..611152539 100644
--- a/test/mail/0072.CALLER
+++ b/test/mail/0072.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
@@ -37,7 +39,8 @@ Test auto reply to third message
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third message
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -51,7 +54,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbD-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
@@ -72,7 +76,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
@@ -88,7 +93,8 @@ Test auto reply to third message
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third message
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -101,7 +107,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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>
diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 45eac6bfe..36a0d7817 100644
--- a/test/mail/0073.CALLER
+++ b/test/mail/0073.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index 667c73139..786212949 100644
--- a/test/mail/0074.CALLER
+++ b/test/mail/0074.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@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 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@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 10HmbB-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index fb5be8ac1..8f75c9e59 100644
--- a/test/mail/0074.userx
+++ b/test/mail/0074.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -19,7 +20,8 @@ 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 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second message
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -33,7 +35,8 @@ 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 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third message
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -47,7 +50,8 @@ 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 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: fourth message
 X-nltest: xxxx
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
@@ -60,7 +64,8 @@ Return-path: <>
 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
+	id 10HmbD-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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>
@@ -78,7 +83,8 @@ 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 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: fifth message
 Reply-to: userx@test.ex,
   abcd@test.ex
@@ -92,7 +98,8 @@ Return-path: <>
 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
+	id 10HmbF-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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>
diff --git a/test/mail/0075.subdir/userx b/test/mail/0075.subdir/userx
index 40bcd43f7..8484826f3 100644
--- a/test/mail/0075.subdir/userx
+++ b/test/mail/0075.subdir/userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0079.rbl b/test/mail/0079.rbl
index 27f7889a5..3e66d6681 100644
--- a/test/mail/0079.rbl
+++ b/test/mail/0079.rbl
@@ -3,7 +3,8 @@ Received: from [V4NET.11.12.13] (helo=exim.test.ex ident=CALLER)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex
 
 test message data
@@ -13,7 +14,8 @@ Received: from [V4NET.11.12.14] (helo=exim.test.ex ident=CALLER)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaY-0005vi-00
-	for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex
 
diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 7a5b5233c..7587d5f48 100644
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -6,7 +6,8 @@ Received: from [V4NET.11.12.13] (helo=exim.test.ex ident=CALLER)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex
 
 test message data
@@ -19,7 +20,8 @@ Received: from [V4NET.11.12.14] (helo=exim.test.ex ident=CALLER)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaY-0005vi-00
-	for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex
 
@@ -32,7 +34,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 sysmail: yes
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: postmaster@exim.test.ex
@@ -46,7 +49,8 @@ Envelope-to: userx@exim.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 10HmbA-0005vi-00
-	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
diff --git a/test/mail/0081.userx b/test/mail/0081.userx
index 4f0d895b0..6deec82c0 100644
--- a/test/mail/0081.userx
+++ b/test/mail/0081.userx
@@ -5,7 +5,8 @@ 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@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-one: This is the first text.
 To: userx@exim.test.ex
 X-one: This is the second text.
diff --git a/test/mail/0082.userx b/test/mail/0082.userx
index 171166279..61540e410 100644
--- a/test/mail/0082.userx
+++ b/test/mail/0082.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 from: me@the.local.host.name
 To: me@the.local.host.name
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
diff --git a/test/mail/0083.userx b/test/mail/0083.userx
index 994175b68..c68c1e7b5 100644
--- a/test/mail/0083.userx
+++ b/test/mail/0083.userx
@@ -5,7 +5,8 @@ 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 <userx@cus.cam.ac.uk>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 from: me@the.local.host.name
 To: me@the.local.host.name
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index 14156674a..fc074234f 100644
--- a/test/mail/0090.CALLER
+++ b/test/mail/0090.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0094.userx b/test/mail/0094.userx
index 255c12026..122fc97eb 100644
--- a/test/mail/0094.userx
+++ b/test/mail/0094.userx
@@ -3,7 +3,8 @@ Received: from [V4NET.11.12.13] (ident=root)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 host_lookup_failed: 1
 host_lookup_deferred: 0
 
@@ -14,7 +15,8 @@ Received: from [99.99.99.99] (ident=root)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 host_lookup_failed: 0
 host_lookup_deferred: 1
 
@@ -25,7 +27,8 @@ Received: from [V4NET.99.99.96] (ident=root)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 host_lookup_failed: 0
 host_lookup_deferred: 1
 
diff --git a/test/mail/0095.userx b/test/mail/0095.userx
index bd5e61c81..8f19a38bb 100644
--- a/test/mail/0095.userx
+++ b/test/mail/0095.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -13,7 +14,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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 quota: 0
 threshold: 10
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -26,7 +28,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 10HmaZ-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 quota: 10K
 threshold: 900
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -38,7 +41,8 @@ A test message
 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
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From : p@q
 Reply-To: a@b
@@ -53,7 +57,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 10HmbB-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 quota: 2200
 threshold: 90%
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
@@ -65,7 +70,8 @@ This is a test message
 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
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Reply-To: x@y
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -83,7 +89,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 10HmbD-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -193,7 +200,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 10HmbE-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0095.userz b/test/mail/0095.userz
index f10b3ea30..d25fcb84a 100644
--- a/test/mail/0095.userz
+++ b/test/mail/0095.userz
@@ -2,7 +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 10HmbG-0005vi-00
-	for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 threshold: 330
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0095.userz.bounce b/test/mail/0095.userz.bounce
index 840e40fd5..13795579b 100644
--- a/test/mail/0095.userz.bounce
+++ b/test/mail/0095.userz.bounce
@@ -1,7 +1,8 @@
 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
+	for userz@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userz@myhost.test.ex
diff --git a/test/mail/0096.userx b/test/mail/0096.userx
index 1dadfc4ce..c100b8a1b 100644
--- a/test/mail/0096.userx
+++ b/test/mail/0096.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: First message subject
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -19,7 +20,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-RBL-Warning: A faked up RBL header
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0097.userx b/test/mail/0097.userx
index 1c062a264..93a552a92 100644
--- a/test/mail/0097.userx
+++ b/test/mail/0097.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: First message subject
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -19,7 +20,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-RBL-Warning: A faked up RBL header
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index 1804b418d..bf763e49f 100644
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -56,7 +57,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -70,7 +72,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -122,7 +125,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -136,7 +140,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbC-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -188,7 +193,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -202,7 +208,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbE-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -249,7 +256,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -263,7 +271,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbF-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -310,7 +319,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -324,7 +334,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbG-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -365,7 +376,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 10HmbB-0005vi-00
-	for xxxx@some.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for xxxx@some.domain;
+	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
@@ -379,7 +391,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbH-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -420,7 +433,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 10HmbD-0005vi-00
-	for yyyy@connection.refused; Tue, 2 Mar 1999 09:44:33 +0000
+	for yyyy@connection.refused;
+	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
@@ -434,7 +448,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbN-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -483,7 +498,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 10HmbM-0005vi-00
-	for rrrr@remote.defer; Tue, 2 Mar 1999 09:44:33 +0000
+	for rrrr@remote.defer;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: testing a remote defer
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0100.CALLER b/test/mail/0100.CALLER
index 49db745bf..74188f3ee 100644
--- a/test/mail/0100.CALLER
+++ b/test/mail/0100.CALLER
@@ -5,7 +5,8 @@ Envelope-to: batch-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)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbK-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbK-0005vi-00;
+	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
diff --git a/test/mail/0100.userw b/test/mail/0100.userw
index 3906e41a9..22e134318 100644
--- a/test/mail/0100.userw
+++ b/test/mail/0100.userw
@@ -8,7 +8,8 @@ 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 10HmbC-0005vi-00
-	for userw@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userw@test.ex;
+	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
diff --git a/test/mail/0100.userx b/test/mail/0100.userx
index 1de79e03f..49156a739 100644
--- a/test/mail/0100.userx
+++ b/test/mail/0100.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -25,7 +26,8 @@ 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 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -167,7 +169,8 @@ 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 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -309,7 +312,8 @@ 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 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -451,7 +455,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -467,7 +472,8 @@ 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 10HmbG-0005vi-00
-	for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-userx@test.ex;
+	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
@@ -488,7 +494,8 @@ 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 10HmbH-0005vi-00
-	for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-userx@test.ex;
+	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
@@ -503,7 +510,8 @@ 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 10HmbI-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -515,7 +523,8 @@ Last line ending without a newline and being a single dot:
 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
+	for mmdf-userx@test.ex;
+	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
@@ -531,7 +540,8 @@ 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 10HmbL-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: From
 Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0100.usery b/test/mail/0100.usery
index a7f470978..76c8f9dee 100644
--- a/test/mail/0100.usery
+++ b/test/mail/0100.usery
@@ -5,7 +5,8 @@ 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
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	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
diff --git a/test/mail/0100.userz b/test/mail/0100.userz
index 41f2f9883..72be2e36d 100644
--- a/test/mail/0100.userz
+++ b/test/mail/0100.userz
@@ -7,7 +7,8 @@ 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 10HmbB-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	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
diff --git a/test/mail/0101.userx b/test/mail/0101.userx
index 4848398b4..47f26daf1 100644
--- a/test/mail/0101.userx
+++ b/test/mail/0101.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -19,7 +20,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -158,7 +160,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -297,7 +300,8 @@ 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 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -436,7 +440,8 @@ 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 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -452,7 +457,8 @@ 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 10HmbE-0005vi-00
-	for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-userx@test.ex;
+	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
@@ -473,7 +479,8 @@ 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
-	for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for filter-userx@test.ex;
+	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
@@ -485,7 +492,8 @@ 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 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -497,7 +505,8 @@ Last line ending without a newline and being a single dot:
 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
+	for mmdf-userx@test.ex;
+	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
@@ -510,7 +519,8 @@ 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 10HmbI-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: From
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0101.userz b/test/mail/0101.userz
index a340c343f..99702ba68 100644
--- a/test/mail/0101.userz
+++ b/test/mail/0101.userz
@@ -7,7 +7,8 @@ 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 10HmbA-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	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
diff --git a/test/mail/0102.batched b/test/mail/0102.batched
index 2160dc31c..1446b307f 100644
--- a/test/mail/0102.batched
+++ b/test/mail/0102.batched
@@ -4,7 +4,8 @@ DATA
 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
+	for batch-userx@test.ex;
+	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
@@ -17,7 +18,8 @@ RCPT TO:<usery@test.ex>
 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
+	id 10HmbH-0005vi-00;
+	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
diff --git a/test/mail/0102.userx b/test/mail/0102.userx
index 2b5ed9885..9d0e91c67 100644
--- a/test/mail/0102.userx
+++ b/test/mail/0102.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -19,7 +20,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
diff --git a/test/mail/0102.usery b/test/mail/0102.usery
index b3cca92ca..e8a0dd254 100644
--- a/test/mail/0102.usery
+++ b/test/mail/0102.usery
@@ -7,7 +7,8 @@ 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 10HmaZ-0005vi-00
-	for bsmtp_usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for bsmtp_usery@test.ex;
+	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
@@ -23,7 +24,8 @@ 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 10HmbA-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	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
diff --git a/test/mail/0102.userz b/test/mail/0102.userz
index 2a8c4ad7f..8badbe955 100644
--- a/test/mail/0102.userz
+++ b/test/mail/0102.userz
@@ -2,7 +2,8 @@
 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
+	for mmdf_userz@test.ex;
+	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
@@ -13,7 +14,8 @@ Test message with mmdf_ prefix
 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
+	for userz@test.ex;
+	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
@@ -24,7 +26,8 @@ Second test message, no prefix.
 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
+	for userz@test.ex;
+	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
diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index afa48bfa3..0cd44188f 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: WASabc@x.y.zWAS
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -41,7 +42,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 10HmaY-0005vi-00
-	for "abc@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for "abc@x.y.z"@test.ex;
+	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
@@ -53,7 +55,8 @@ Message sent to "abc@x.y.z"@test.ex.
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: ":fail: fail message"@special
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -92,7 +95,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 10HmbC-0005vi-00
-	for ":fail: fail message"@special; Tue, 2 Mar 1999 09:44:33 +0000
+	for ":fail: fail message"@special;
+	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
diff --git a/test/mail/0103.rewritten b/test/mail/0103.rewritten
index c01a105ab..2ab37d5d7 100644
--- a/test/mail/0103.rewritten
+++ b/test/mail/0103.rewritten
@@ -2,7 +2,8 @@ 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
-	for "xyz@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for "xyz@x.y.z"@test.ex;
+	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/0104.mmm b/test/mail/0104.mmm
index bc9255776..fce42952b 100644
--- a/test/mail/0104.mmm
+++ b/test/mail/0104.mmm
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for mmm@ten-1; Tue, 2 Mar 1999 09:44:33 +0000
+	for mmm@ten-1;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: You <mmm@ten-1.test.ex>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0104.yyy b/test/mail/0104.yyy
index 4096709e3..524d44fe4 100644
--- a/test/mail/0104.yyy
+++ b/test/mail/0104.yyy
@@ -2,7 +2,8 @@ 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
-	for yyy@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for yyy@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: comment <yyy@test.ex>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0105.default b/test/mail/0105.default
index d6218632d..659737227 100644
--- a/test/mail/0105.default
+++ b/test/mail/0105.default
@@ -5,7 +5,8 @@ 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 10HmaZ-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	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/0105.firstuser b/test/mail/0105.firstuser
index 98088c7d9..d5911df60 100644
--- a/test/mail/0105.firstuser
+++ b/test/mail/0105.firstuser
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for firstuser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for firstuser@test.ex;
+	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/0105.seconduser b/test/mail/0105.seconduser
index 90f98df37..95768bebb 100644
--- a/test/mail/0105.seconduser
+++ b/test/mail/0105.seconduser
@@ -5,7 +5,8 @@ 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
-	for seconduser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for seconduser@test.ex;
+	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
diff --git a/test/mail/0110.second b/test/mail/0110.second
index 3f228bef7..463905418 100644
--- a/test/mail/0110.second
+++ b/test/mail/0110.second
@@ -2,7 +2,8 @@ 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
-	for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for first@test.ex;
+	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..55931f55c 100644
--- a/test/mail/0111.userx
+++ b/test/mail/0111.userx
@@ -3,7 +3,8 @@ Envelope-to: userx@test.ex
 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
+	for userx@test.ex;
+	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
@@ -16,7 +17,8 @@ Envelope-to: Philip@test.ex
 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
+	for Philip@test.ex;
+	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
@@ -29,7 +31,8 @@ Envelope-to: philip@test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for philip@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for philip@test.ex;
+	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/0112.file b/test/mail/0112.file
index 7bc02a7a6..c6b849555 100644
--- a/test/mail/0112.file
+++ b/test/mail/0112.file
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for file@test.ex;
+	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
diff --git a/test/mail/0112.pipe b/test/mail/0112.pipe
index 3f86bc8ae..365a8d012 100644
--- a/test/mail/0112.pipe
+++ b/test/mail/0112.pipe
@@ -2,7 +2,8 @@ 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
-	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe@test.ex;
+	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/0113.second b/test/mail/0113.second
index 3f228bef7..463905418 100644
--- a/test/mail/0113.second
+++ b/test/mail/0113.second
@@ -2,7 +2,8 @@ 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
-	for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for first@test.ex;
+	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..333eba467 100644
--- a/test/mail/0114.file
+++ b/test/mail/0114.file
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for file@test.ex;
+	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
@@ -11,7 +12,8 @@ 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
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: A. File <file@test.ex>, No One <null@test.ex>
 Subject: autoreply
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
diff --git a/test/mail/0114.pipe b/test/mail/0114.pipe
index 3f86bc8ae..365a8d012 100644
--- a/test/mail/0114.pipe
+++ b/test/mail/0114.pipe
@@ -2,7 +2,8 @@ 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
-	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe@test.ex;
+	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/0115.file b/test/mail/0115.file
index cce750388..cddb34286 100644
--- a/test/mail/0115.file
+++ b/test/mail/0115.file
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -14,7 +15,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for one-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for one-userx@test.ex;
+	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
@@ -26,7 +28,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for two-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for two-userx@test.ex;
+	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
@@ -38,7 +41,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for three-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for three-userx@test.ex;
+	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
diff --git a/test/mail/0116.acopy b/test/mail/0116.acopy
index e9c3e763e..5e9b35727 100644
--- a/test/mail/0116.acopy
+++ b/test/mail/0116.acopy
@@ -1,7 +1,8 @@
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/0116.alias1 b/test/mail/0116.alias1
index e9c3e763e..5e9b35727 100644
--- a/test/mail/0116.alias1
+++ b/test/mail/0116.alias1
@@ -1,7 +1,8 @@
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/0116.alias2 b/test/mail/0116.alias2
index e9c3e763e..5e9b35727 100644
--- a/test/mail/0116.alias2
+++ b/test/mail/0116.alias2
@@ -1,7 +1,8 @@
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/0116.dcopy b/test/mail/0116.dcopy
index d53ee0bea..ee483d5ac 100644
--- a/test/mail/0116.dcopy
+++ b/test/mail/0116.dcopy
@@ -1,7 +1,8 @@
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -12,7 +13,8 @@ Message sent to dcopy.
 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
+	id 10HmaX-0005vi-00;
+	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/0118.userx b/test/mail/0118.userx
index e3b863543..81cfe1358 100644
--- a/test/mail/0118.userx
+++ b/test/mail/0118.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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..0f5f1860c 100644
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
@@ -20,7 +21,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
@@ -35,7 +37,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
@@ -50,7 +53,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
@@ -65,7 +69,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
@@ -80,7 +85,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbC-0005vi-00@myhost.ex>
@@ -95,7 +101,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbD-0005vi-00@myhost.ex>
@@ -110,7 +117,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbE-0005vi-00@myhost.ex>
@@ -125,7 +133,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.ex>)
 	id 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbF-0005vi-00@myhost.ex>
@@ -140,7 +149,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
 Message-Id: <E10HmbG-0005vi-00@myhost.ex>
diff --git a/test/mail/0131.copy b/test/mail/0131.copy
index 798a7af6e..40c68fb85 100644
--- a/test/mail/0131.copy
+++ b/test/mail/0131.copy
@@ -2,7 +2,8 @@ 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
-	for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@not.test.ex;
+	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/0131.userx b/test/mail/0131.userx
index 85a3958ce..c2f3a115f 100644
--- a/test/mail/0131.userx
+++ b/test/mail/0131.userx
@@ -2,7 +2,8 @@ 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
-	for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@not.test.ex;
+	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/0133.dddd b/test/mail/0133.dddd
index 98c203b70..fd840134b 100644
--- a/test/mail/0133.dddd
+++ b/test/mail/0133.dddd
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -14,7 +15,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 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
+	id 10HmaX-0005vi-00;
+	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/0134.UC-USERX b/test/mail/0134.UC-USERX
index 78e8ca8ee..69685e0d0 100644
--- a/test/mail/0134.UC-USERX
+++ b/test/mail/0134.UC-USERX
@@ -2,7 +2,8 @@ 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 10HmbD-0005vi-00
-	for USERX@KNOWN.DOMAIN; Tue, 2 Mar 1999 09:44:33 +0000
+	for USERX@KNOWN.DOMAIN;
+	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
diff --git a/test/mail/0134.directfile b/test/mail/0134.directfile
index aa9475d5f..486a62ecf 100644
--- a/test/mail/0134.directfile
+++ b/test/mail/0134.directfile
@@ -2,7 +2,8 @@ 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 10HmbF-0005vi-00
-	for direct_file_user@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for direct_file_user@test.ex;
+	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
diff --git a/test/mail/0134.lc-unknown b/test/mail/0134.lc-unknown
index 4495f885d..511bd216a 100644
--- a/test/mail/0134.lc-unknown
+++ b/test/mail/0134.lc-unknown
@@ -2,7 +2,8 @@ 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
-	for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for unknown@test.ex;
+	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
@@ -15,7 +16,8 @@ Test message
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -29,7 +31,8 @@ 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 10HmbC-0005vi-00
-	for UNKNOWN@KNOWN.DOMAIN; Tue, 2 Mar 1999 09:44:33 +0000
+	for UNKNOWN@KNOWN.DOMAIN;
+	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
diff --git a/test/mail/0134.lc-userx b/test/mail/0134.lc-userx
index 0d8a3c837..53e63756c 100644
--- a/test/mail/0134.lc-userx
+++ b/test/mail/0134.lc-userx
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@unknown.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@unknown.test.ex;
+	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
@@ -15,7 +16,8 @@ Test message
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -29,7 +31,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@unknown.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@unknown.domain;
+	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
@@ -42,7 +45,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
-	for userx@known.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@known.domain;
+	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
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 16e7a1891..2fb7c1551 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -1,7 +1,8 @@
 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
+	for forwarder@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -44,7 +45,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -56,7 +58,8 @@ Test message.
 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
+	for forwarder@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -99,7 +102,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmbA-0005vi-00;
+	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 cfcf6e2f7..9fb813a0e 100644
--- a/test/mail/0137.userx
+++ b/test/mail/0137.userx
@@ -2,7 +2,8 @@ From t1@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <t1@foo>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: First
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <t1@foo>
@@ -16,7 +17,8 @@ From t1@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <t1@foo>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Second
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <t1@foo>
@@ -30,7 +32,8 @@ From t2@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <t2@foo>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Third
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <t2@foo>
@@ -44,7 +47,8 @@ From t3@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <t3@foo>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Fourth
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <t3@foo>
diff --git a/test/mail/0139.userx b/test/mail/0139.userx
index cf8d04bff..0bd4941fc 100644
--- a/test/mail/0139.userx
+++ b/test/mail/0139.userx
@@ -6,7 +6,8 @@ Received: from [V4NET.11.12.22] (ident=CALLER)
 	by the.local.host.name with smtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DNSlist: rbl4.test.ex This is a test blacklisting4 message V4NET.11.12.22
 DNSlist: rbl5.test.ex This is a test blacklisting5 message V4NET.11.12.22
 
diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index 7a53cce8b..2e62f7819 100644
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: Reply Person <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
@@ -22,7 +23,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: reply2@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -60,7 +62,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
-	for reply2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for reply2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message; non-printer ><
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER
index f7938eb83..0627eb6c7 100644
--- a/test/mail/0142.CALLER
+++ b/test/mail/0142.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -47,7 +48,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	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/0142.filter b/test/mail/0142.filter
index 7dca98165..37919a8d3 100644
--- a/test/mail/0142.filter
+++ b/test/mail/0142.filter
@@ -1,7 +1,8 @@
 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
+	id 10HmaX-0005vi-00;
+	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/0150.postmaster b/test/mail/0150.postmaster
index eb51b1c2f..d95d9ab66 100644
--- a/test/mail/0150.postmaster
+++ b/test/mail/0150.postmaster
@@ -2,7 +2,8 @@ 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
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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>
 Sender: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0151.postmaster b/test/mail/0151.postmaster
index 58f860c6d..9b0eabee9 100644
--- a/test/mail/0151.postmaster
+++ b/test/mail/0151.postmaster
@@ -2,7 +2,8 @@ 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
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
diff --git a/test/mail/0152.postmaster b/test/mail/0152.postmaster
index 2e2315621..d182cf1fd 100644
--- a/test/mail/0152.postmaster
+++ b/test/mail/0152.postmaster
@@ -2,7 +2,8 @@ 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
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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>
 Sender: CALLER_NAME <CALLER@test.ex>
@@ -14,7 +15,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -25,7 +27,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: call+CALLER@test.ex
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
@@ -37,7 +40,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -48,7 +52,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -59,7 +64,8 @@ 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 10HmbC-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: CALLER&call@test.ex
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
@@ -71,7 +77,8 @@ 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 10HmbD-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -82,7 +89,8 @@ 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 10HmbE-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
diff --git a/test/mail/0159.userx b/test/mail/0159.userx
index e03f9d061..90f907d76 100644
--- a/test/mail/0159.userx
+++ b/test/mail/0159.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO [ip4.ip4.ip4.ip4]
@@ -11,7 +12,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO [IPV4:ip4.ip4.ip4.ip4]
@@ -20,7 +22,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4] (helo=ip4.ip4.ip4.ip4)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO ip4.ip4.ip4.ip4
@@ -29,7 +32,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4] (helo=[V4NET.1.2.3])
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO [V4NET.1.2.3]
diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 256103573..3bfb359b6 100644
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -60,7 +61,8 @@ USER=system-filter
 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
+	for pipe@test.ex;
+	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
@@ -84,7 +86,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 10HmaX-0005vi-00
-	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe@test.ex;
+	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
@@ -95,7 +98,8 @@ 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -153,7 +157,8 @@ USER=system-filter
 >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
+	id 10HmaZ-0005vi-00;
+	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
@@ -176,7 +181,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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 13bf30b33..8c5e67b86 100644
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -60,7 +61,8 @@ USER=system-filter
 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
+	for pipe@test.ex;
+	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
@@ -84,7 +86,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 10HmaX-0005vi-00
-	for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pipe@test.ex;
+	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
@@ -95,7 +98,8 @@ 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -155,7 +159,8 @@ USER=system-filter
 >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
+	id 10HmaZ-0005vi-00;
+	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
@@ -178,7 +183,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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 d07630976..b7862d4e4 100644
--- a/test/mail/0166.userx
+++ b/test/mail/0166.userx
@@ -3,7 +3,8 @@ Envelope-to: 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
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	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/0166.usery b/test/mail/0166.usery
index 8076ae65d..74cb2b781 100644
--- a/test/mail/0166.usery
+++ b/test/mail/0166.usery
@@ -3,7 +3,8 @@ Envelope-to: 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
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	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/0167.userx b/test/mail/0167.userx
index c5ac0af4a..d9f87620f 100644
--- a/test/mail/0167.userx
+++ b/test/mail/0167.userx
@@ -4,7 +4,8 @@ Envelope-to: userx@test.ex
 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
+	for userx@test.ex;
+	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
@@ -15,7 +16,8 @@ Return-path: <>
 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
+	for userx@test.ex;
+	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
@@ -27,7 +29,8 @@ Envelope-to: userx@test.ex
 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
+	for userx@test.ex;
+	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..325e274ee 100644
--- a/test/mail/0169.userx
+++ b/test/mail/0169.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -13,7 +14,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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 quota: 0
 threshold: 10
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -26,7 +28,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 10HmbA-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 quota: 50M
 threshold: 41%
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0171.CALLER b/test/mail/0171.CALLER
index 74a65676a..80019b0e1 100644
--- a/test/mail/0171.CALLER
+++ b/test/mail/0171.CALLER
@@ -2,7 +2,8 @@ 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
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	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/0173.userx b/test/mail/0173.userx
index e5448334c..8169ade91 100644
--- a/test/mail/0173.userx
+++ b/test/mail/0173.userx
@@ -2,11 +2,13 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -17,10 +19,12 @@ Test message
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0173.usery b/test/mail/0173.usery
index f7da5ec65..38706b8f3 100644
--- a/test/mail/0173.usery
+++ b/test/mail/0173.usery
@@ -1,10 +1,12 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0173.userz b/test/mail/0173.userz
index f7da5ec65..38706b8f3 100644
--- a/test/mail/0173.userz
+++ b/test/mail/0173.userz
@@ -1,10 +1,12 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0174.CALLER b/test/mail/0174.CALLER
index 8df061489..c55713fd7 100644
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@non-local.example
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,10 +40,12 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbC-0005vi-00;
+	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 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	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
diff --git a/test/mail/0174.userx b/test/mail/0174.userx
index 8ef0afb6c..54d1a5342 100644
--- a/test/mail/0174.userx
+++ b/test/mail/0174.userx
@@ -2,11 +2,13 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -16,10 +18,12 @@ Test message
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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
@@ -29,10 +33,12 @@ Another test message
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbC-0005vi-00;
+	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 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	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
diff --git a/test/mail/0174.usery b/test/mail/0174.usery
index e4bfa8a1e..6554fde69 100644
--- a/test/mail/0174.usery
+++ b/test/mail/0174.usery
@@ -1,10 +1,12 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0174.userz b/test/mail/0174.userz
index e4bfa8a1e..6554fde69 100644
--- a/test/mail/0174.userz
+++ b/test/mail/0174.userz
@@ -1,10 +1,12 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0176.CALLER b/test/mail/0176.CALLER
index 1cc0d544d..37ba89d1c 100644
--- a/test/mail/0176.CALLER
+++ b/test/mail/0176.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: someone@somewhere
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,7 +40,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 10HmaX-0005vi-00
-	for someone@somewhere; Tue, 2 Mar 1999 09:44:33 +0000
+	for someone@somewhere;
+	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/0177.CALLER b/test/mail/0177.CALLER
index 30bddcaa7..c6019ec1b 100644
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -40,7 +41,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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: fail this
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0177.userx b/test/mail/0177.userx
index b1c66701f..7062d8076 100644
--- a/test/mail/0177.userx
+++ b/test/mail/0177.userx
@@ -2,7 +2,8 @@ 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 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -14,7 +15,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this (1)
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -26,7 +28,8 @@ 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 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this (2)
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 2fc9e36ea..4e913a4eb 100644
--- a/test/mail/0177.usery
+++ b/test/mail/0177.usery
@@ -1,7 +1,8 @@
 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
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@test.ex
 Subject: auto fail message
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
@@ -16,7 +17,8 @@ failing userx@test.ex
 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
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
@@ -31,7 +33,8 @@ freezing userx@test.ex
 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
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
@@ -46,7 +49,8 @@ This is a text line
 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
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
@@ -61,7 +65,8 @@ freezing userx@test.ex
 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
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
diff --git a/test/mail/0182.userx b/test/mail/0182.userx
index 3c666c667..48fdc6eba 100644
--- a/test/mail/0182.userx
+++ b/test/mail/0182.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0189.userx b/test/mail/0189.userx
index eda035d5b..f182ad5ed 100644
--- a/test/mail/0189.userx
+++ b/test/mail/0189.userx
@@ -4,7 +4,8 @@ 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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -17,7 +18,8 @@ Envelope-to: userx@myhost.test.ex
 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
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@some.domain
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <root@myhost.test.ex>
diff --git a/test/mail/0192.userx b/test/mail/0192.userx
index a55a9bb85..b585bb99d 100644
--- a/test/mail/0192.userx
+++ b/test/mail/0192.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -13,7 +14,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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER
index 79944e6cb..bbef20ee3 100644
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex
@@ -58,7 +59,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -70,7 +72,8 @@ This is a test message.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: seven@myhost.test.ex,
   six@myhost.test.ex,
   five@myhost.test.ex,
@@ -161,7 +164,8 @@ Content-type: message/rfc822
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -173,7 +177,8 @@ Here's another message.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex
@@ -233,7 +238,8 @@ Content-type: message/rfc822
 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
+	id 10HmbC-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ret: 99
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 49eeb21f2..164beddda 100644
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -4,7 +4,8 @@ RCPT TO:<usery@copy.domain>
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -17,7 +18,8 @@ RCPT TO:<y@copy.domain>
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index b3d6cfeae..3d5baab14 100644
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 .: this is legal
 From: me@test.ex
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
@@ -16,7 +17,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: me@test.ex
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
@@ -29,7 +31,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: me@test.ex
 ..: this really is legal
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
@@ -44,7 +47,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: me@test.ex
 ..: this really is legal
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
diff --git a/test/mail/0205.redirected b/test/mail/0205.redirected
index 889ceb26d..820b7dfb7 100644
--- a/test/mail/0205.redirected
+++ b/test/mail/0205.redirected
@@ -2,7 +2,8 @@ From postmaster@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
-	for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for redirect@test.ex;
+	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
diff --git a/test/mail/0205.x b/test/mail/0205.x
index cabaaf1cb..1d747a9b2 100644
--- a/test/mail/0205.x
+++ b/test/mail/0205.x
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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/0210.file b/test/mail/0210.file
index feb122504..ec36393b1 100644
--- a/test/mail/0210.file
+++ b/test/mail/0210.file
@@ -6,7 +6,8 @@ Return-path: <>
 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
+	id 10HmaX-0005vi-00;
+	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/0210.pipe b/test/mail/0210.pipe
index 4d976d64d..5081629d8 100644
--- a/test/mail/0210.pipe
+++ b/test/mail/0210.pipe
@@ -5,7 +5,8 @@ Return-path: <>
 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
+	id 10HmaX-0005vi-00;
+	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/0211.CALLER b/test/mail/0211.CALLER
index 1501b9140..99c35391e 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -45,7 +46,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 10HmaX-0005vi-00
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	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
@@ -58,7 +60,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
@@ -111,7 +114,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0220.userx b/test/mail/0220.userx
index 0eadbaa41..4b893ffcd 100644
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -2,7 +2,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <foo@bar>)
 	id 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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>
@@ -13,7 +14,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <foo@bar>)
 	id 10HmaZ-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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>
@@ -24,7 +26,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 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
+	for userx@test.ex;
+	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>
@@ -35,7 +38,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <foo@bar>)
 	id 10HmbB-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: foobydooby <foo@bar>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
@@ -46,7 +50,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 10HmbF-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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..35f5435f1 100644
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -2,7 +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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -12,7 +13,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 10HmaZ-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -22,7 +24,8 @@ 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 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -32,7 +35,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 10HmbB-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: foobydooby <foo@bar>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1
index 6db0b20c3..bbdd7ab0d 100644
--- a/test/mail/0222.foo1
+++ b/test/mail/0222.foo1
@@ -1,7 +1,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 foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for foo1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -15,7 +16,8 @@ Auto reply message
 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
+	for foo1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@test.ex
 In-Reply-To: <E10HmbG-0005vi-00@myhost.test.ex>
 References: <E10HmbG-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index a932aa023..8b4a9b1ee 100644
--- a/test/mail/0222.foo2
+++ b/test/mail/0222.foo2
@@ -1,7 +1,8 @@
 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
+	for foo2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: foo2@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@myhost.test.ex>
 References: <E10HmbA-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 574730524..068677ad3 100644
--- a/test/mail/0222.foo3
+++ b/test/mail/0222.foo3
@@ -1,7 +1,8 @@
 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
+	for foo3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: foo3@test.ex
 In-Reply-To: <E10HmbD-0005vi-00@myhost.test.ex>
 References: <E10HmbD-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 45eac6bfe..36a0d7817 100644
--- a/test/mail/0223.CALLER
+++ b/test/mail/0223.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbB-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index ee6af38b3..651d237e2 100644
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: bounce@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -49,7 +50,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -64,7 +66,8 @@ Envelope-to: CALLER@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -124,7 +127,8 @@ Content-type: text/rfc822-headers
 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
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second message
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index e8425b6de..fd1e8d774 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe1@no.test.ex,
   file1@no.test.ex
 Auto-Submitted: auto-replied
@@ -46,7 +47,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	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
@@ -58,7 +60,8 @@ Message 1
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe2@yes.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -115,7 +118,8 @@ USER=pipe2
 >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
+	id 10HmaZ-0005vi-00;
+	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
@@ -139,7 +143,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0226.file b/test/mail/0226.file
index 27c3caf48..96b080e4d 100644
--- a/test/mail/0226.file
+++ b/test/mail/0226.file
@@ -1,7 +1,8 @@
 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
+	id 10HmaZ-0005vi-00;
+	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/0230.x b/test/mail/0230.x
index 6027b25e1..bef6df0d0 100644
--- a/test/mail/0230.x
+++ b/test/mail/0230.x
@@ -3,7 +3,8 @@ Received: from [ip4.ip4.ip4.ip4] (port=1113)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaY-0005vi-00
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1113
 
 
@@ -12,7 +13,8 @@ Received: from [127.0.0.1] (port=1114)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaZ-0005vi-00
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1114
 
 
@@ -21,7 +23,8 @@ Received: from [ip4.ip4.ip4.ip4] (port=1115 helo=rhubarb)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmbA-0005vi-00
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1115
 
 
@@ -30,7 +33,8 @@ Received: from [V4NET.9.8.7] (port=1111 ident=root)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaX-0005vi-00
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1111
 
 -oMa message
diff --git a/test/mail/0231.a b/test/mail/0231.a
index e83069fae..78f1acb3c 100644
--- a/test/mail/0231.a
+++ b/test/mail/0231.a
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
diff --git a/test/mail/0231.b b/test/mail/0231.b
index ef29f5fea..6c2677d91 100644
--- a/test/mail/0231.b
+++ b/test/mail/0231.b
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
diff --git a/test/mail/0233.me b/test/mail/0233.me
index 2efa3588c..055405515 100644
--- a/test/mail/0233.me
+++ b/test/mail/0233.me
@@ -1,7 +1,8 @@
 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
+	for me@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
@@ -20,7 +21,8 @@ The following address(es) have yet to be delivered:
 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
+	for me@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
@@ -35,7 +37,8 @@ The sender is <CALLER@myhost.test.ex>.
 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
+	for me@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster
index 6c0b1ff4e..987bdd637 100644
--- a/test/mail/0233.postmaster
+++ b/test/mail/0233.postmaster
@@ -1,7 +1,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 postmaster@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: postmaster@myhost.test.ex
 Subject: System filter has frozen
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 6b607c26b..66ed3824d 100644
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -44,7 +45,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	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
@@ -56,7 +58,8 @@ Message 1
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -112,7 +115,8 @@ USER=pipe2
 >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
+	id 10HmaZ-0005vi-00;
+	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
@@ -136,7 +140,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/0237.file b/test/mail/0237.file
index 27c3caf48..96b080e4d 100644
--- a/test/mail/0237.file
+++ b/test/mail/0237.file
@@ -1,7 +1,8 @@
 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
+	id 10HmaZ-0005vi-00;
+	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/0240.subdir/userx b/test/mail/0240.subdir/userx
index e3b863543..81cfe1358 100644
--- a/test/mail/0240.subdir/userx
+++ b/test/mail/0240.subdir/userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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..81cfe1358 100644
--- a/test/mail/0241.userx
+++ b/test/mail/0241.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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..6be4af42f 100644
--- a/test/mail/0243.CALLER
+++ b/test/mail/0243.CALLER
@@ -1,7 +1,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
+	for CALLER@nl.demon.net;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: local.part@some.domain
 Reply-To: x@y, 
  p@q
diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER
index 8f9e5141b..8b64f2207 100644
--- a/test/mail/0246.CALLER
+++ b/test/mail/0246.CALLER
@@ -1,7 +1,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@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@myhost.test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0252.t1 b/test/mail/0252.t1
index c81584d8b..2cb4252fb 100644
--- a/test/mail/0252.t1
+++ b/test/mail/0252.t1
@@ -3,7 +3,8 @@ Return-path: <postmaster@test.ex>
 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
+	for userx@myhost.test.ex;
+	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
@@ -15,7 +16,8 @@ Return-path: <postmaster@test.ex>
 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
+	for alias@myhost.test.ex;
+	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
@@ -27,7 +29,8 @@ Return-path: <postmaster@test.ex>
 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
+	for forward@myhost.test.ex;
+	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
@@ -39,7 +42,8 @@ Return-path: <postmaster@test.ex>
 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
+	for smart@myhost.test.ex;
+	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
diff --git a/test/mail/0252.t2 b/test/mail/0252.t2
index 557cf2780..4d3c34c01 100644
--- a/test/mail/0252.t2
+++ b/test/mail/0252.t2
@@ -3,7 +3,8 @@ Return-path: <abc@x.y.z>
 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
+	for userx@myhost.test.ex;
+	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
@@ -15,7 +16,8 @@ Return-path: <alias@test.ex>
 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
+	for alias@myhost.test.ex;
+	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
@@ -27,7 +29,8 @@ Return-path: <forward@test.ex>
 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
+	for forward@myhost.test.ex;
+	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
@@ -39,7 +42,8 @@ Return-path: <smart@test.ex>
 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
+	for smart@myhost.test.ex;
+	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
diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index 09ce0e9ba..0f9014010 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -1,7 +1,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 lmn@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for lmn@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fail@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -47,7 +48,8 @@ Content-type: message/rfc822
 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
+	id 10HmaZ-0005vi-00;
+	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
diff --git a/test/mail/0253.t1 b/test/mail/0253.t1
index 89e645ffb..a5bac9c9e 100644
--- a/test/mail/0253.t1
+++ b/test/mail/0253.t1
@@ -4,7 +4,8 @@ DATA
 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
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0253.t2 b/test/mail/0253.t2
index 7a64b8ccf..648b1c348 100644
--- a/test/mail/0253.t2
+++ b/test/mail/0253.t2
@@ -4,7 +4,8 @@ DATA
 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
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER
index 0cf46b1d9..95da9460a 100644
--- a/test/mail/0256.CALLER
+++ b/test/mail/0256.CALLER
@@ -1,6 +1,7 @@
 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
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,7 +40,8 @@ Return-path: <CALLER@test.ex>
 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
+	for unknown@test.ex;
+	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 996f8d0df..80a36c35a 100644
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -1,6 +1,7 @@
 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
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,7 +40,8 @@ Return-path: <"abc@def"@unknown.domain>
 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
+	for unknown@test.ex;
+	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 0cf46b1d9..95da9460a 100644
--- a/test/mail/0256.abcd+test.ex+xxxx
+++ b/test/mail/0256.abcd+test.ex+xxxx
@@ -1,6 +1,7 @@
 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
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,7 +40,8 @@ Return-path: <CALLER@test.ex>
 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
+	for unknown@test.ex;
+	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 996f8d0df..80a36c35a 100644
--- a/test/mail/0256.abcd+unknown.domain+"abc@def"
+++ b/test/mail/0256.abcd+unknown.domain+"abc@def"
@@ -1,6 +1,7 @@
 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
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,7 +40,8 @@ Return-path: <"abc@def"@unknown.domain>
 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
+	for unknown@test.ex;
+	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..1cc37c54d 100644
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 crheader: includes <
  > and ends CRLF
 Subject: this is still a header
@@ -22,7 +23,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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 crheader: includes <
  > and ends CRLF
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -42,7 +44,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 10HmaZ-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 crheader: includes <
  > and ends CRLF
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -61,7 +64,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 10HmbA-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -73,7 +77,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 10HmbB-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -84,7 +89,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 10HmbC-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -96,7 +102,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 10HmbD-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -107,7 +114,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 10HmbE-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 .dotheader: header line starts with a dot
 xxx: dot bare CR:.
  xyz
@@ -123,7 +131,8 @@ 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 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: contains CR<
  > in the subject
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
@@ -139,7 +148,8 @@ 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 10HmbG-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: contains CR<
  > in the subject
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0260.userx b/test/mail/0260.userx
index c620db5d7..38cacf606 100644
--- a/test/mail/0260.userx
+++ b/test/mail/0260.userx
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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 144bf0131..01e8196c5 100644
--- a/test/mail/0266.CALLER
+++ b/test/mail/0266.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nmlist@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -41,7 +42,8 @@ Return-path: <CALLER@test.ex>
 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
+	for nmlist@test.ex;
+	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
diff --git a/test/mail/0266.filter b/test/mail/0266.filter
index 137fab1f6..246a40b94 100644
--- a/test/mail/0266.filter
+++ b/test/mail/0266.filter
@@ -4,7 +4,8 @@ Envelope-to: filter@test.ex
 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
+	for filter@test.ex;
+	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..3fad77f6f 100644
--- a/test/mail/0266.filter2
+++ b/test/mail/0266.filter2
@@ -4,7 +4,8 @@ Envelope-to: filter2@test.ex
 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
+	for filter2@test.ex;
+	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
diff --git a/test/mail/0266.filter3 b/test/mail/0266.filter3
index 62ddce124..7cff0f589 100644
--- a/test/mail/0266.filter3
+++ b/test/mail/0266.filter3
@@ -4,7 +4,8 @@ Envelope-to: filter3@test.ex
 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
+	for filter3@test.ex;
+	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
diff --git a/test/mail/0266.list2 b/test/mail/0266.list2
index 7b7dd1431..e9258c236 100644
--- a/test/mail/0266.list2
+++ b/test/mail/0266.list2
@@ -4,7 +4,8 @@ Envelope-to: list2@test.ex
 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
+	for list2@test.ex;
+	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/0266.postmaster b/test/mail/0266.postmaster
index 9abd0cc6b..068b0706c 100644
--- a/test/mail/0266.postmaster
+++ b/test/mail/0266.postmaster
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -24,7 +25,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -45,7 +47,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -68,7 +71,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -89,7 +93,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -112,7 +117,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
diff --git a/test/mail/0266.spqr b/test/mail/0266.spqr
index 6c1c436e7..a0dab117c 100644
--- a/test/mail/0266.spqr
+++ b/test/mail/0266.spqr
@@ -4,7 +4,8 @@ Envelope-to: list@test.ex
 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
+	for list@test.ex;
+	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..a0dab117c 100644
--- a/test/mail/0266.userx
+++ b/test/mail/0266.userx
@@ -4,7 +4,8 @@ Envelope-to: list@test.ex
 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
+	for list@test.ex;
+	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 144bf0131..01e8196c5 100644
--- a/test/mail/0270.CALLER
+++ b/test/mail/0270.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nmlist@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -41,7 +42,8 @@ Return-path: <CALLER@test.ex>
 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
+	for nmlist@test.ex;
+	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
diff --git a/test/mail/0270.filter b/test/mail/0270.filter
index 137fab1f6..246a40b94 100644
--- a/test/mail/0270.filter
+++ b/test/mail/0270.filter
@@ -4,7 +4,8 @@ Envelope-to: filter@test.ex
 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
+	for filter@test.ex;
+	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..3fad77f6f 100644
--- a/test/mail/0270.filter2
+++ b/test/mail/0270.filter2
@@ -4,7 +4,8 @@ Envelope-to: filter2@test.ex
 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
+	for filter2@test.ex;
+	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
diff --git a/test/mail/0270.filter3 b/test/mail/0270.filter3
index 62ddce124..7cff0f589 100644
--- a/test/mail/0270.filter3
+++ b/test/mail/0270.filter3
@@ -4,7 +4,8 @@ Envelope-to: filter3@test.ex
 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
+	for filter3@test.ex;
+	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
diff --git a/test/mail/0270.list2 b/test/mail/0270.list2
index 7b7dd1431..e9258c236 100644
--- a/test/mail/0270.list2
+++ b/test/mail/0270.list2
@@ -4,7 +4,8 @@ Envelope-to: list2@test.ex
 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
+	for list2@test.ex;
+	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/0270.postmaster b/test/mail/0270.postmaster
index 18ad82c96..c466262c6 100644
--- a/test/mail/0270.postmaster
+++ b/test/mail/0270.postmaster
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -24,7 +25,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -45,7 +47,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -68,7 +71,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -89,7 +93,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
@@ -112,7 +117,8 @@ Return-path: <>
 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
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
diff --git a/test/mail/0270.spqr b/test/mail/0270.spqr
index 6c1c436e7..a0dab117c 100644
--- a/test/mail/0270.spqr
+++ b/test/mail/0270.spqr
@@ -4,7 +4,8 @@ Envelope-to: list@test.ex
 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
+	for list@test.ex;
+	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..a0dab117c 100644
--- a/test/mail/0270.userx
+++ b/test/mail/0270.userx
@@ -4,7 +4,8 @@ Envelope-to: list@test.ex
 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
+	for list@test.ex;
+	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..38cacf606 100644
--- a/test/mail/0274.abcd
+++ b/test/mail/0274.abcd
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..38cacf606 100644
--- a/test/mail/0274.redirect
+++ b/test/mail/0274.redirect
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..38cacf606 100644
--- a/test/mail/0274.userx
+++ b/test/mail/0274.userx
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..38cacf606 100644
--- a/test/mail/0274.xyz
+++ b/test/mail/0274.xyz
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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 1029f14de..da6b63af4 100644
--- a/test/mail/0280.CALLER
+++ b/test/mail/0280.CALLER
@@ -1,6 +1,7 @@
 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
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: spqr@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -39,7 +40,8 @@ Return-path: <spqr@test.ex>
 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
+	for spqr@test.ex;
+	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
@@ -49,7 +51,8 @@ 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
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: abcd@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -88,7 +91,8 @@ Return-path: <abcd@test.ex>
 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
+	for abcd@test.ex;
+	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/0282.userx b/test/mail/0282.userx
index abd61fa18..9f085dd63 100644
--- a/test/mail/0282.userx
+++ b/test/mail/0282.userx
@@ -3,7 +3,8 @@ Received: from [127.0.0.1] (port=1111 helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 interface-port: 1225
 received-port:  1225
 
@@ -14,7 +15,8 @@ Received: from [127.0.0.1] (port=1112 helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 interface-port: 1226
 received-port:  1226
 
diff --git a/test/mail/0283.CALLER b/test/mail/0283.CALLER
index 4169dc503..f074668fb 100644
--- a/test/mail/0283.CALLER
+++ b/test/mail/0283.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: somebody@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -45,7 +46,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 10HmaY-0005vi-00
-	for somebody@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for somebody@myhost.test.ex;
+	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
diff --git a/test/mail/0284.batched b/test/mail/0284.batched
index 51d20fbb5..7664bb818 100644
--- a/test/mail/0284.batched
+++ b/test/mail/0284.batched
@@ -3,7 +3,8 @@ Envelope-to: x-t1@test.ex,
  y-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
+	id 10HmaX-0005vi-00;
+	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
@@ -14,7 +15,8 @@ Envelope-to: x-t4@test.ex,
  xx-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
+	id 10HmbA-0005vi-00;
+	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
@@ -25,7 +27,8 @@ Envelope-to: y-t4@test.ex,
  yy-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
+	id 10HmbA-0005vi-00;
+	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..a4cdadad4 100644
--- a/test/mail/0284.other.domain
+++ b/test/mail/0284.other.domain
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 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
+	id 10HmaZ-0005vi-00;
+	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..6d625cfaf 100644
--- a/test/mail/0284.test.ex
+++ b/test/mail/0284.test.ex
@@ -3,7 +3,8 @@ Envelope-to: x-t3@test.ex,
  y-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
+	id 10HmaZ-0005vi-00;
+	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..c916dbb01 100644
--- a/test/mail/0284.x-t2
+++ b/test/mail/0284.x-t2
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 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
+	id 10HmaY-0005vi-00;
+	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..c390cc582 100644
--- a/test/mail/0284.y-t2
+++ b/test/mail/0284.y-t2
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 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
+	id 10HmaY-0005vi-00;
+	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..fd1dc12e3 100644
--- a/test/mail/0289.CALLER
+++ b/test/mail/0289.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index 7451024be..5858faffd 100644
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: failure@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,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
-	for failure@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for failure@myhost.test.ex;
+	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/0298.CALLER b/test/mail/0298.CALLER
index b3ee1e863..8851e6b01 100644
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: failure1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -41,7 +42,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
-	for failure1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for failure1@myhost.test.ex;
+	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
@@ -52,7 +54,8 @@ 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: failure2@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -91,7 +94,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 10HmaZ-0005vi-00
-	for failure2@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for failure2@myhost.test.ex;
+	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 01aae7fcd..c0623e8e6 100644
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -1,7 +1,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 anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+	for anyone@anywhere;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,8 @@ Return-path: <anyone@anywhere>
 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
+	for list1@lists.test.ex;
+	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
@@ -51,7 +53,8 @@ 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
+	for anyone@anywhere;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -90,7 +93,8 @@ Return-path: <anyone@anywhere>
 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
+	for nonlist@lists.test.ex;
+	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 01aae7fcd..c0623e8e6 100644
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -1,7 +1,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 anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+	for anyone@anywhere;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,8 @@ Return-path: <anyone@anywhere>
 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
+	for list1@lists.test.ex;
+	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
@@ -51,7 +53,8 @@ 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
+	for anyone@anywhere;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -90,7 +93,8 @@ Return-path: <anyone@anywhere>
 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
+	for nonlist@lists.test.ex;
+	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 42a604112..32243c9a0 100644
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: 1k@myhost.test.ex,
   55@myhost.test.ex,
   50@myhost.test.ex
@@ -50,7 +51,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	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/0310.CALLER b/test/mail/0310.CALLER
index 2be400b76..7fcde232b 100644
--- a/test/mail/0310.CALLER
+++ b/test/mail/0310.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: abcd@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,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
-	for abcd@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for abcd@myhost.test.ex;
+	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/0318.subdir/userx b/test/mail/0318.subdir/userx
index 6f77ef9ee..52fe82994 100644
--- a/test/mail/0318.subdir/userx
+++ b/test/mail/0318.subdir/userx
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/0319.saved b/test/mail/0319.saved
index d23681e94..e36361885 100644
--- a/test/mail/0319.saved
+++ b/test/mail/0319.saved
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 subject: file
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER
index 891b20b3d..db1bd9bf3 100644
--- a/test/mail/0321.CALLER
+++ b/test/mail/0321.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -40,7 +41,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 10HmaX-0005vi-00
-	for |/bin/cat\ /etc/aliases\ @test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for |/bin/cat\ /etc/aliases\ @test.ex;
+	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/0324.userx b/test/mail/0324.userx
index b83389d67..229b7d05f 100644
--- a/test/mail/0324.userx
+++ b/test/mail/0324.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/test/mail/0326.userx b/test/mail/0326.userx
index 2beaf0d6b..3721930f8 100644
--- a/test/mail/0326.userx
+++ b/test/mail/0326.userx
@@ -2,7 +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
-	for pppp-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for pppp-userx@test.ex;
+	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
@@ -14,7 +15,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 10HmaY-0005vi-00
-	for userx+ssss@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx+ssss@test.ex;
+	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
@@ -26,7 +28,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 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0327.userx b/test/mail/0327.userx
index 78566bda4..8b5293f04 100644
--- a/test/mail/0327.userx
+++ b/test/mail/0327.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -12,7 +13,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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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..37a3b2a1f 100644
--- a/test/mail/0328.userx
+++ b/test/mail/0328.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0329.userx b/test/mail/0329.userx
index c000ee10f..37a3b2a1f 100644
--- a/test/mail/0329.userx
+++ b/test/mail/0329.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0330.userz1 b/test/mail/0330.userz1
index 0c6f01926..efcde1158 100644
--- a/test/mail/0330.userz1
+++ b/test/mail/0330.userz1
@@ -3,7 +3,8 @@ Envelope-to: userx@test.ex
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Remove: This header should go
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -15,7 +16,8 @@ Envelope-to: UserY@test.ex
 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
+	for UserY@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Remove: This header should go
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -27,7 +29,8 @@ Envelope-to: usery@test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Remove: This header should go
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0335.batch b/test/mail/0335.batch
index 9af240869..4dea42b38 100644
--- a/test/mail/0335.batch
+++ b/test/mail/0335.batch
@@ -3,7 +3,8 @@ Envelope-to: batch@test.ex
 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
+	for batch@test.ex;
+	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..3391d9d16 100644
--- a/test/mail/0335.clone
+++ b/test/mail/0335.clone
@@ -6,7 +6,8 @@ Envelope-to: clone@test.ex,
  c2@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
+	id 10HmbB-0005vi-00;
+	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..331cb2df4 100644
--- a/test/mail/0335.final
+++ b/test/mail/0335.final
@@ -3,7 +3,8 @@ Envelope-to: onelevel2@test.ex,
  onelevel1@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
+	id 10HmaX-0005vi-00;
+	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
@@ -14,7 +15,8 @@ Envelope-to: top2@test.ex,
  top1@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
+	id 10HmaY-0005vi-00;
+	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
@@ -27,7 +29,8 @@ Envelope-to: onelevel2@test.ex,
  top1@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
+	id 10HmaZ-0005vi-00;
+	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..9d162633b 100644
--- a/test/mail/0338.a1-userx
+++ b/test/mail/0338.a1-userx
@@ -3,7 +3,8 @@ Return-path: <postmaster@test.ex>
 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
+	for userx@test.ex;
+	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..9d162633b 100644
--- a/test/mail/0338.a2-userx
+++ b/test/mail/0338.a2-userx
@@ -3,7 +3,8 @@ Return-path: <postmaster@test.ex>
 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
+	for userx@test.ex;
+	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..5ae00dd5d 100644
--- a/test/mail/0341.mailbox
+++ b/test/mail/0341.mailbox
@@ -3,7 +3,8 @@ Envelope-to: userx@test.ex,
  usery@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
+	id 10HmaX-0005vi-00;
+	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..53a69a872 100644
--- a/test/mail/0346.x
+++ b/test/mail/0346.x
@@ -3,7 +3,8 @@ Envelope-to: x@dom1,
  x@dom2
 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
+	id 10HmaX-0005vi-00;
+	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..5689bd318 100644
--- a/test/mail/0349.xxxx
+++ b/test/mail/0349.xxxx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0351.userx b/test/mail/0351.userx
index 41b34c002..87205f785 100644
--- a/test/mail/0351.userx
+++ b/test/mail/0351.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -37,7 +38,8 @@ two
 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
+	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
diff --git a/test/mail/0352.userx b/test/mail/0352.userx
index 4b16d1949..aa464cfc3 100644
--- a/test/mail/0352.userx
+++ b/test/mail/0352.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From:                      
 To:                         
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
@@ -18,7 +19,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: abcd@test.ex
 To:         
 To: xyz@test.ex
@@ -38,7 +40,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To:         
 To: abcd@test.ex
 To: xyz@test.ex
@@ -58,7 +61,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex
diff --git a/test/mail/0359.userx b/test/mail/0359.userx
index 67eae78d3..89d4c9a01 100644
--- a/test/mail/0359.userx
+++ b/test/mail/0359.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0374.CALLER b/test/mail/0374.CALLER
index 15131c92b..02dac6c74 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: d3@myhost.test.ex,
   b1@myhost.test.ex
 Auto-Submitted: auto-replied
@@ -52,7 +53,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	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..6a13384d2 100644
--- a/test/mail/0374.a1
+++ b/test/mail/0374.a1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..6a13384d2 100644
--- a/test/mail/0374.a1-u
+++ b/test/mail/0374.a1-u
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..5c8344494 100644
--- a/test/mail/0374.b1
+++ b/test/mail/0374.b1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..4bd219cbe 100644
--- a/test/mail/0374.c1
+++ b/test/mail/0374.c1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..114ddf00d 100644
--- a/test/mail/0374.d1
+++ b/test/mail/0374.d1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..69412e6b2 100644
--- a/test/mail/0374.d2
+++ b/test/mail/0374.d2
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..05ff4c6bc 100644
--- a/test/mail/0374.d3
+++ b/test/mail/0374.d3
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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 9dc76c961..c2f6cc10f 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: e1@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -45,7 +46,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	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..6a13384d2 100644
--- a/test/mail/0375.a1
+++ b/test/mail/0375.a1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..ba0e749a4 100644
--- a/test/mail/0375.a1-u
+++ b/test/mail/0375.a1-u
@@ -3,7 +3,8 @@ Return-path: <>
 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
+	id 10HmaX-0005vi-00;
+	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..5c8344494 100644
--- a/test/mail/0375.b1
+++ b/test/mail/0375.b1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..4bd219cbe 100644
--- a/test/mail/0375.c1
+++ b/test/mail/0375.c1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..114ddf00d 100644
--- a/test/mail/0375.d1
+++ b/test/mail/0375.d1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..69412e6b2 100644
--- a/test/mail/0375.d2
+++ b/test/mail/0375.d2
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..05ff4c6bc 100644
--- a/test/mail/0375.d3
+++ b/test/mail/0375.d3
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..2e66957d1 100644
--- a/test/mail/0375.e1
+++ b/test/mail/0375.e1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..02836f036 100644
--- a/test/mail/0375.f1
+++ b/test/mail/0375.f1
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..8f49d3d9b 100644
--- a/test/mail/0375.f2
+++ b/test/mail/0375.f2
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..64b53ea39 100644
--- a/test/mail/0375.f3
+++ b/test/mail/0375.f3
@@ -3,7 +3,8 @@ Return-path: <CALLER@myhost.test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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..fd31f0dda 100644
--- a/test/mail/0375.h1
+++ b/test/mail/0375.h1
@@ -4,7 +4,8 @@ Envelope-to: h1@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
-	for h1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for h1@myhost.test.ex;
+	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..fd31f0dda 100644
--- a/test/mail/0375.h1-u
+++ b/test/mail/0375.h1-u
@@ -4,7 +4,8 @@ Envelope-to: h1@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
-	for h1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for h1@myhost.test.ex;
+	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..b5e250f24 100644
--- a/test/mail/0377.aaaa
+++ b/test/mail/0377.aaaa
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..b5e250f24 100644
--- a/test/mail/0377.bbbb
+++ b/test/mail/0377.bbbb
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..b5e250f24 100644
--- a/test/mail/0377.cccc
+++ b/test/mail/0377.cccc
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..889d8d5c5 100644
--- a/test/mail/0378.file
+++ b/test/mail/0378.file
@@ -2,7 +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
-	for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for aaaa@myhost.test.ex;
+	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..b5e250f24 100644
--- a/test/mail/0379.bbbb
+++ b/test/mail/0379.bbbb
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..b5e250f24 100644
--- a/test/mail/0379.cccc
+++ b/test/mail/0379.cccc
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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..b5e250f24 100644
--- a/test/mail/0380.bbbb
+++ b/test/mail/0380.bbbb
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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 817741767..2e62b0671 100644
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -1,7 +1,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -61,7 +62,8 @@ USER=system-filter
 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
+	for alice@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: alice@test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -86,7 +88,8 @@ Return-path: <CALLER@test.ex>
 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
+	for alice@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: alice@test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -98,7 +101,8 @@ 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -157,7 +161,8 @@ USER=system-filter
 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
+	for jabberwocky@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: jabberwocky@test.ex
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -182,7 +187,8 @@ Return-path: <CALLER@test.ex>
 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
+	for jabberwocky@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: jabberwocky@test.ex
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -194,7 +200,8 @@ 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: redking@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -254,7 +261,8 @@ USER=redking
 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
+	for redking@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: redking@test.ex
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -279,7 +287,8 @@ Return-path: <CALLER@test.ex>
 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
+	for redking@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: redking@test.ex
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index 8f4f15a54..9ed1a0cac 100644
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.CALLER
@@ -1,7 +1,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -40,7 +41,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: body size = 2
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -53,7 +55,8 @@ X
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -92,7 +95,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: body size = 200
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -108,7 +112,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -147,7 +152,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: body size = 1600
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -191,7 +197,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -230,7 +237,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/0386.2 b/test/mail/0386.2
index d320a6751..79c2eea4a 100644
--- a/test/mail/0386.2
+++ b/test/mail/0386.2
@@ -3,7 +3,8 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+	for 2@b;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message
 
@@ -14,7 +15,8 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+	for 2@b;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message
 
diff --git a/test/mail/0393.userx b/test/mail/0393.userx
index 24ab3d64f..52949d4ff 100644
--- a/test/mail/0393.userx
+++ b/test/mail/0393.userx
@@ -2,7 +2,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -13,7 +14,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -24,7 +26,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0395.CALLER b/test/mail/0395.CALLER
index 55c623f70..ca59cb37a 100644
--- a/test/mail/0395.CALLER
+++ b/test/mail/0395.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 5c7e799bf..69b311ed1 100644
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@origin.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: philip
 To: userx
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
@@ -14,7 +15,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@origin.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@origin.ex
 To: userx@test.ex
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
@@ -26,7 +28,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@test.ex
 To: userx@test.ex
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
@@ -38,7 +41,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
-	for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@origin.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: philip
 To: userx
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
@@ -49,7 +53,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx
 To: userx
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
@@ -61,7 +66,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@test.ex
 To: userx@test.ex
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
@@ -73,7 +79,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx
 To: userx
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
@@ -85,7 +92,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@test.ex
 To: userx@test.ex
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
diff --git a/test/mail/0398.x b/test/mail/0398.x
index 85dde19fd..081d38b6d 100644
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -2,7 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 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
+	for x@local;
+	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/0404.sender b/test/mail/0404.sender
index fd77af8fe..611ed1326 100644
--- a/test/mail/0404.sender
+++ b/test/mail/0404.sender
@@ -1,6 +1,7 @@
 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
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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>
diff --git a/test/mail/0408.userx b/test/mail/0408.userx
index 159be9823..1e4491cca 100644
--- a/test/mail/0408.userx
+++ b/test/mail/0408.userx
@@ -2,7 +2,8 @@ From usery@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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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..0289ce689 100644
--- a/test/mail/0411.afolder
+++ b/test/mail/0411.afolder
@@ -2,7 +2,8 @@ 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 10HmaX-0005vi-00
-	for t1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for t1@test.ex;
+	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
@@ -11,7 +12,8 @@ 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
+	id 10HmaY-0005vi-00;
+	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 410121dae..d5c6f6d0f 100644
--- a/test/mail/0412.CALLER
+++ b/test/mail/0412.CALLER
@@ -2,7 +2,8 @@ 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
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -18,7 +19,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Reply-to:
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
@@ -35,7 +37,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Reply-to: usery@test.ex
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
@@ -52,7 +55,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From:
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0421.a b/test/mail/0421.a
index e8cc113a5..1a3f0e15e 100644
--- a/test/mail/0421.a
+++ b/test/mail/0421.a
@@ -2,7 +2,8 @@ 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 10HmaX-0005vi-00
-	for a@b.c; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@b.c;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: abc@x.y.z
 To: abc@x.y.z
 Reply-to: abc@x.y.z
diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index dad1f7448..770923728 100644
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@test.ex
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -43,7 +44,8 @@ Return-path: <CALLER@test.ex>
 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
+	for restrict-userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Filter: require "fileinto"; fileinto "userx-extra";
 Message-Id: <E10HmbB-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -59,7 +61,8 @@ Envelope-to: CALLER@test.ex
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: restrict-userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -98,7 +101,8 @@ Return-path: <CALLER@test.ex>
 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
+	for restrict-userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Filter: fileinto "userx-extra";
 Message-Id: <E10HmbD-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0428.inbox.JUNK b/test/mail/0428.inbox.JUNK
index 1ccfe989a..3f93f6258 100644
--- a/test/mail/0428.inbox.JUNK
+++ b/test/mail/0428.inbox.JUNK
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbG-0005vi-00
-	for userx8@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx8@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99
 Message-Id: <E10HmbG-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -25,7 +26,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbI-0005vi-00
-	for userx10@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx10@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99-
 Message-Id: <E10HmbI-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -45,7 +47,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbJ-0005vi-00
-	for userx11@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx11@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: -99
 Message-Id: <E10HmbJ-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
@@ -65,7 +68,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbK-0005vi-00
-	for userx12@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx12@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: -99
 Message-Id: <E10HmbK-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0428.redirected b/test/mail/0428.redirected
index fc048367b..7aceb5728 100644
--- a/test/mail/0428.redirected
+++ b/test/mail/0428.redirected
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Filter: redirect "redirected@test.ex";
 Message-Id: <E10HmbA-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0428.someone b/test/mail/0428.someone
index 8939761ea..6f57e0426 100644
--- a/test/mail/0428.someone
+++ b/test/mail/0428.someone
@@ -4,7 +4,8 @@ Envelope-to: someone@test.ex
 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
+	for someone@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: userx13@test.ex
 To: someone@test.ex
 Subject: Automated reply
diff --git a/test/mail/0428.userx b/test/mail/0428.userx
index b47f439e7..600a1db2c 100644
--- a/test/mail/0428.userx
+++ b/test/mail/0428.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Filter: if true { stop; fileinto "inbox.never"; }
 Message-Id: <E10HmbF-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0428.userx-extra b/test/mail/0428.userx-extra
index d7dc5ae1b..b62c85883 100644
--- a/test/mail/0428.userx-extra
+++ b/test/mail/0428.userx-extra
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Filter: require "fileinto"; fileinto "userx-extra";
 Message-Id: <E10HmaZ-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0428.userx-sawsuffix b/test/mail/0428.userx-sawsuffix
index c2a457a7e..2483f42c2 100644
--- a/test/mail/0428.userx-sawsuffix
+++ b/test/mail/0428.userx-sawsuffix
@@ -4,7 +4,8 @@ Envelope-to: userx14-suffix@test.ex
 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
+	id 10HmbN-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
 From: someone@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0428.userx13 b/test/mail/0428.userx13
index 7a70d93b1..97d6e86df 100644
--- a/test/mail/0428.userx13
+++ b/test/mail/0428.userx13
@@ -5,7 +5,8 @@ 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 10HmbL-0005vi-00
-	for userx13@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx13@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx13@test.ex
 Message-Id: <E10HmbL-0005vi-00@mail.test.ex>
 From: someone@test.ex
diff --git a/test/mail/0428.userx14 b/test/mail/0428.userx14
index 0c542a788..d80030f45 100644
--- a/test/mail/0428.userx14
+++ b/test/mail/0428.userx14
@@ -4,7 +4,8 @@ Envelope-to: userx14-suffix2@test.ex
 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
+	id 10HmbN-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbN-0005vi-00@mail.test.ex>
 From: someone@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0428.userx9 b/test/mail/0428.userx9
index 1cfb1560a..927e6144e 100644
--- a/test/mail/0428.userx9
+++ b/test/mail/0428.userx9
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbH-0005vi-00
-	for userx9@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx9@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99
 Message-Id: <E10HmbH-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0431.xxx b/test/mail/0431.xxx
index 263f826fe..9c302d06c 100644
--- a/test/mail/0431.xxx
+++ b/test/mail/0431.xxx
@@ -4,7 +4,8 @@ DATA
 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
+	for pre.xxx@a.b;
+	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
@@ -16,7 +17,8 @@ DATA
 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
+	for pre.xxx@a.b;
+	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..f3bacbedd 100644
--- a/test/mail/0436.CALLER
+++ b/test/mail/0436.CALLER
@@ -10,7 +10,8 @@ Envelope-to: a@d1.ex,
  d@d2.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
+	id 10HmaX-0005vi-00;
+	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..796aff2e2 100644
--- a/test/mail/0437.file
+++ b/test/mail/0437.file
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
@@ -13,7 +14,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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER
index 76b76de6b..4c17f742a 100644
--- a/test/mail/0444.CALLER
+++ b/test/mail/0444.CALLER
@@ -1,7 +1,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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: Mailer-Daemon@test.ex
 Reply-To: postmaster@test.ex
 To: CALLER@test.ex
@@ -35,7 +36,8 @@ to correct the fault described above.
 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
+	for userx@test.ex;
+	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/0444.userx b/test/mail/0444.userx
index 687b228a8..2c82672fa 100644
--- a/test/mail/0444.userx
+++ b/test/mail/0444.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0446.userx b/test/mail/0446.userx
index 4aebdbe23..416fabca4 100644
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: the first received: line
 Received: the second received: line
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -16,7 +17,8 @@ From CALLER@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@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: the first received: line
 Received: the second received: line
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0449.userx b/test/mail/0449.userx
index 7976e948a..a4e2dd65f 100644
--- a/test/mail/0449.userx
+++ b/test/mail/0449.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0452.CALLER b/test/mail/0452.CALLER
index a0aac71f9..d2901211e 100644
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -1,7 +1,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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@test.ex
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -20,7 +21,8 @@ This is some body text
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -59,7 +61,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 fno: 2
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0452.userx b/test/mail/0452.userx
index 385e9ec18..2cb003b21 100644
--- a/test/mail/0452.userx
+++ b/test/mail/0452.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 fno: 1
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0460.userx b/test/mail/0460.userx
index 7e9d15b61..1cdbed5f7 100644
--- a/test/mail/0460.userx
+++ b/test/mail/0460.userx
@@ -3,7 +3,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: x@y
 To: some@one
 Subject: contains >
@@ -17,7 +18,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: x@y
 Bheader: some text
 To: some@one
diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 0f19a62b1..543b7596f 100644
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -1,7 +1,8 @@
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -40,7 +41,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	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
@@ -52,7 +54,8 @@ Short message
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -91,7 +94,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	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
@@ -103,7 +107,8 @@ Short message
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -142,7 +147,8 @@ Return-path: <CALLER@test.ex>
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/0472.userz99 b/test/mail/0472.userz99
index ca8fa0d8a..fe0e79d9a 100644
--- a/test/mail/0472.userz99
+++ b/test/mail/0472.userz99
@@ -2,7 +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
-	for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@myhost.test.ex;
+	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
@@ -13,7 +14,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 10HmaY-0005vi-00
-	for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@myhost.test.ex;
+	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
diff --git a/test/mail/0480.userx b/test/mail/0480.userx
index 4ab8184e5..02779e4c8 100644
--- a/test/mail/0480.userx
+++ b/test/mail/0480.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=foobar)
 	by the.local.host.name with smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-sah: host.127.0.0.1
 
 
diff --git a/test/mail/0481.userx b/test/mail/0481.userx
index 4af9fec86..bebca9641 100644
--- a/test/mail/0481.userx
+++ b/test/mail/0481.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Another: This is another header
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -14,7 +15,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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Another: This is another header
 X-Ren-dont:	test globbing
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0485.userx b/test/mail/0485.userx
index de28e95d1..e911fcc48 100644
--- a/test/mail/0485.userx
+++ b/test/mail/0485.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [1.2.3.4] (helo=x.y.z ident=CALLER)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -11,7 +12,8 @@ Received: from [1.2.3.4] (helo=x.y.z ident=CALLER)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <nonnull@non.null>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
diff --git a/test/mail/0487.userx b/test/mail/0487.userx
index 42d5c111a..637fd9c86 100644
--- a/test/mail/0487.userx
+++ b/test/mail/0487.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=x.y)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
diff --git a/test/mail/0491.userx b/test/mail/0491.userx
index d03d18632..77d67cee7 100644
--- a/test/mail/0491.userx
+++ b/test/mail/0491.userx
@@ -2,7 +2,8 @@ From "abc@xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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
@@ -12,7 +13,8 @@ From a.b@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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
@@ -22,7 +24,8 @@ From ".a.b"@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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
@@ -32,7 +35,8 @@ From "a.b."@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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
@@ -42,7 +46,8 @@ From "a\"b"@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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
@@ -52,7 +57,8 @@ From "abc@xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: x@y
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <"abc@xyz"@myhost.test.ex>
@@ -63,7 +69,8 @@ From "abc%xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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..31f618e20 100644
--- a/test/mail/0493.a
+++ b/test/mail/0493.a
@@ -2,7 +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
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	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/0494.userx b/test/mail/0494.userx
index 4379cb298..b3551e242 100644
--- a/test/mail/0494.userx
+++ b/test/mail/0494.userx
@@ -1,7 +1,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 userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 Subject: testing, testing
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index 32240fd54..c0010e1a5 100644
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -3,7 +3,8 @@ At-Start: some text
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for someone@el.se; Tue, 2 Mar 1999 09:44:33 +0000
+	for someone@el.se;
+	Tue, 2 Mar 1999 09:44:33 +0000
 After-Received: some text
 From: some@ne
 To: someone@el.se
diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index 78312f0d1..e8882eb56 100644
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -2,7 +2,8 @@ From postmaster@y Tue Mar 02 09:44:33 1999
 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
+	for userx@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: testing
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: postmaster@y
diff --git a/test/mail/0503.userx b/test/mail/0503.userx
index afa0a578b..53e38b6b5 100644
--- a/test/mail/0503.userx
+++ b/test/mail/0503.userx
@@ -2,7 +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 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index 8a069ca13..0f3ea3d84 100644
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -1,7 +1,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 postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -50,7 +51,8 @@ Content-type: message/rfc822
 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
+	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
 
diff --git a/test/mail/0514.userx b/test/mail/0514.userx
index 5f22df611..4f967feb2 100644
--- a/test/mail/0514.userx
+++ b/test/mail/0514.userx
@@ -2,7 +2,8 @@ From "spaced user"@myhost.test.ex Tue Mar 02 09:44:33 1999
 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
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index b9b1a1bc3..67462d318 100644
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -2,7 +2,8 @@ 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
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	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/0517.usery b/test/mail/0517.usery
index 79f02e6af..3afba6d55 100644
--- a/test/mail/0517.usery
+++ b/test/mail/0517.usery
@@ -2,6 +2,7 @@ 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 10HmaY-0005vi-00
-	for usery@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 
diff --git a/test/mail/0522.CALLER b/test/mail/0522.CALLER
index 867dea897..972fdfd43 100644
--- a/test/mail/0522.CALLER
+++ b/test/mail/0522.CALLER
@@ -1,7 +1,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nofilter@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -40,7 +41,8 @@ Return-path: <CALLER@test.ex>
 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
+	for nofilter@test.ex;
+	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
@@ -51,7 +53,8 @@ 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -90,7 +93,8 @@ Return-path: <CALLER@test.ex>
 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
+	for filter@test.ex;
+	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..9f1636901 100644
--- a/test/mail/0523.userx
+++ b/test/mail/0523.userx
@@ -5,7 +5,8 @@ Envelope-to: four@test.ex,
  one@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
+	id 10HmaX-0005vi-00;
+	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/0530.CALLER b/test/mail/0530.CALLER
index d07382180..9c578bbaa 100644
--- a/test/mail/0530.CALLER
+++ b/test/mail/0530.CALLER
@@ -1,7 +1,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@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, no In-Reply-to
 In-Reply-To: <m1@b>
@@ -16,7 +17,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, In-Reply-to
 In-Reply-To: <m1@b>
@@ -31,7 +33,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (1), In-Reply-to
 In-Reply-To: <m1@b>
@@ -46,7 +49,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (5), no In-Reply-to
 In-Reply-To: <m1@b>
@@ -61,7 +65,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (15), In-Reply-to
 In-Reply-To: <m1@b>
@@ -76,7 +81,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, no In-Reply-to
 Auto-Submitted: auto-replied
@@ -89,7 +95,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, In-Reply-to
 References: <i1@b>
@@ -103,7 +110,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (1), In-Reply-to
 References: <r1@b>
@@ -117,7 +125,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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>
@@ -131,7 +140,8 @@ This is the text of the autoreply.
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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>
diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index fb54ab68f..0c7d1ecaa 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -42,7 +43,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -54,7 +56,8 @@ 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@retry.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -96,7 +99,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 10HmaZ-0005vi-00
-	for userx@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@retry.test.ex;
+	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
@@ -108,7 +112,8 @@ 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@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -151,7 +156,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 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index e669ef777..541141825 100644
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -2,7 +2,8 @@ From mailok@test.ex Tue Mar 02 09:44:33 1999
 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
+	for rcptok@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 cond: accept
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: mailok@test.ex
@@ -27,7 +28,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 10HmaY-0005vi-00
-	for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for rcptok@test.ex;
+	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/0533.mbox b/test/mail/0533.mbox
index 26716f507..8cfd547b8 100644
--- a/test/mail/0533.mbox
+++ b/test/mail/0533.mbox
@@ -3,7 +3,8 @@ Envelope-to: file-usery=mbox@test.ex,
  file-userx=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
+	id 10HmaX-0005vi-00;
+	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/0533.mbox2 b/test/mail/0533.mbox2
index 4d2c7548b..70051402c 100644
--- a/test/mail/0533.mbox2
+++ b/test/mail/0533.mbox2
@@ -3,7 +3,8 @@ Envelope-to: file-usera=mbox2@test.ex,
  file-userz=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
+	id 10HmaX-0005vi-00;
+	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/0535.userx b/test/mail/0535.userx
index e3994508e..6d4c7652d 100644
--- a/test/mail/0535.userx
+++ b/test/mail/0535.userx
@@ -2,7 +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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -13,7 +14,8 @@ From nofix@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <nofix@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Added: userx@test.ex
 
 No headers supplied.
@@ -22,7 +24,8 @@ From x@y Tue Mar 02 09:44:33 1999
 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
+	for userx@test.ex;
+	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
@@ -33,7 +36,8 @@ From nofix@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
 	(envelope-from <nofix@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Added: userx@test.ex
 
 No headers supplied.
diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 8a6490899..5fa14e582 100644
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -1,7 +1,8 @@
 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
+	for oksender@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,8 @@ Return-path: <oksender@test.ex>
 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
+	for user22@test.ex;
+	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 7be8501d9..a123ee8f3 100644
--- a/test/mail/0536.user1
+++ b/test/mail/0536.user1
@@ -1,7 +1,8 @@
 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
+	for user1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user1@test.ex
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 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
+	for user1@myhost.test.ex;
+	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 33eb92a5b..2589ffa13 100644
--- a/test/mail/0536.user2
+++ b/test/mail/0536.user2
@@ -1,7 +1,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 user2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for user2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user2@test.ex
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 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
+	for user1@myhost.test.ex;
+	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..3c4b8eeb6 100644
--- a/test/mail/0551.userx
+++ b/test/mail/0551.userx
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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
@@ -11,7 +12,8 @@ Message 1
 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
+	id 10HmaY-0005vi-00;
+	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
@@ -22,7 +24,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 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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/0551.usery b/test/mail/0551.usery
index e4d855b81..0cc28e74c 100644
--- a/test/mail/0551.usery
+++ b/test/mail/0551.usery
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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/0551.userz b/test/mail/0551.userz
index 29b2f0da7..4399da8fc 100644
--- a/test/mail/0551.userz
+++ b/test/mail/0551.userz
@@ -1,7 +1,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 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/0566.userx b/test/mail/0566.userx
index e5f0975da..d5c4a50c3 100644
--- a/test/mail/0566.userx
+++ b/test/mail/0566.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=Testing)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -16,7 +17,8 @@ Received: from CALLER (helo=Testing)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -29,7 +31,8 @@ Received: from CALLER (helo=Testing)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0567.rcptok b/test/mail/0567.rcptok
index deffea8fc..5c0c1854b 100644
--- a/test/mail/0567.rcptok
+++ b/test/mail/0567.rcptok
@@ -2,7 +2,8 @@ From mailok@test.ex Tue Mar 02 09:44:33 1999
 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
+	for rcptok@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 cond: accept
 X-Data-2: Line two
 X-Data-5: Line five
@@ -33,7 +34,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 10HmaY-0005vi-00
-	for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for rcptok@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 
diff --git a/test/mail/0573.limited b/test/mail/0573.limited
index 6c6cf5112..279b95ff1 100644
--- a/test/mail/0573.limited
+++ b/test/mail/0573.limited
@@ -1,7 +1,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 limited@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for limited@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fred@undeliverable.org
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,8 @@ Return-path: <limited@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <limited@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for fred@undeliverable.org; Tue, 2 Mar 1999 09:44:33 +0000
+	for fred@undeliverable.org;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: limited@myhost.test.ex
diff --git a/test/mail/0573.not_limited b/test/mail/0573.not_limited
index e0f150907..9a85ce107 100644
--- a/test/mail/0573.not_limited
+++ b/test/mail/0573.not_limited
@@ -1,7 +1,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 not_limited@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for not_limited@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fred@undeliverable.org
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,8 @@ Return-path: <not_limited@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <not_limited@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for fred@undeliverable.org; Tue, 2 Mar 1999 09:44:33 +0000
+	for fred@undeliverable.org;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: not_limited@myhost.test.ex
diff --git a/test/mail/0580.local b/test/mail/0580.local
index 5ee7d9dd9..9df481db9 100644
--- a/test/mail/0580.local
+++ b/test/mail/0580.local
@@ -1,7 +1,8 @@
 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 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER
index 9b2bf6100..2cd5947d5 100644
--- a/test/mail/0600.CALLER
+++ b/test/mail/0600.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaX-0005vi-00
-	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 x-test-header-good1: 1234567890qwertzuiopasdfghjklyxcvbnm,.-QWERTZUIOP+*ASDFGHJKL#'YXCVBNM,.-;:_
 x-test-header-good2: ßüöä€ÜÖÄ´ऑकज�ᑌᑕ�𫟘
 x-test-header-too-short: Ã.Ã.Ã.ä-â‚.-Ãœ.Ã..Ã.-Â.-à..-à¤.-à¤.-á�.-á‘.-á..-ð«�..ð«Ÿ.
@@ -18,7 +19,7 @@ From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
-X-message-linecount: 17
+X-message-linecount: 18
 X-received-count: 1
 
 This is a test message.
@@ -32,14 +33,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaY-0005vi-00
-	for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@the.local.host.name;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 9
+X-message-linecount: 10
 X-received-count: 1
 
 This is a second test message.
diff --git a/test/mail/0606.b b/test/mail/0606.b
index ef81a0910..c8b3b8296 100644
--- a/test/mail/0606.b
+++ b/test/mail/0606.b
@@ -3,7 +3,8 @@ Envelope-to: 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
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: foo
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/mail/0608.bounce_message b/test/mail/0608.bounce_message
index ad949ce66..2af284a81 100644
--- a/test/mail/0608.bounce_message
+++ b/test/mail/0608.bounce_message
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: a@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,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 10HmbC-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.1 - Default deny message
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -52,7 +54,8 @@ 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 10HmbF-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: b@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -92,7 +95,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 10HmbE-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.2 - Specified deny message file
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -104,7 +108,8 @@ 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 10HmbG-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: c@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -143,7 +148,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
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.3 - Specified, missing deny message file
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -155,7 +161,8 @@ 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 10HmbH-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: d@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -194,7 +201,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 10HmaY-0005vi-00
-	for d@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for d@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.4 - Specified, non-absolute
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -206,7 +214,8 @@ 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 10HmbI-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: e@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -245,7 +254,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 10HmaZ-0005vi-00
-	for e@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for e@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.5 - Specified, expansion empty
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -257,7 +267,8 @@ 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 10HmbJ-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: f@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -296,7 +307,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 10HmbA-0005vi-00
-	for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for f@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.6 - Specified, expansion tainted
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -308,7 +320,8 @@ 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 10HmbL-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: g@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -348,7 +361,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 10HmbK-0005vi-00
-	for g@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for g@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.7 - Specified, expansion good
 Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -360,7 +374,8 @@ 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 10HmbP-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
@@ -408,7 +423,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 10HmbM-0005vi-00
-	for delay_p@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for delay_p@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.1 - Default delay message
 Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -420,7 +436,8 @@ 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 10HmbQ-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
@@ -461,7 +478,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 10HmbN-0005vi-00
-	for delay_q@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for delay_q@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.2 - Specified delay message file
 Message-Id: <E10HmbN-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -473,7 +491,8 @@ 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 10HmbR-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
@@ -521,7 +540,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 10HmbB-0005vi-00
-	for delay_r@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for delay_r@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.3 - Specified, missing delay message file
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -533,7 +553,8 @@ 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 10HmbS-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
@@ -574,7 +595,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 10HmbO-0005vi-00
-	for delay_s@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for delay_s@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.7 - Specified, expansion good
 Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/0612.rmt_accept b/test/mail/0612.rmt_accept
index 3f1121556..e315bd95e 100644
--- a/test/mail/0612.rmt_accept
+++ b/test/mail/0612.rmt_accept
@@ -3,12 +3,14 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <b@dump.ex>)
 	id 10HmaZ-0005vi-00
-	for rmt_accept@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for rmt_accept@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [ip4.ip4.ip4.ip4] (helo=testclient)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <b@dump.ex>)
 	id 10HmaY-0005vi-00
-	for rmt_accept@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for rmt_accept@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 
 
diff --git a/test/mail/0906.a b/test/mail/0906.a
index a55f68d7f..3e58a13ed 100644
--- a/test/mail/0906.a
+++ b/test/mail/0906.a
@@ -3,15 +3,17 @@ Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
 	by testhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [127.0.0.1] (helo=test.com)
 	by testhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <sender@dom>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: foo
 X-body-linecount: 0
-X-message-linecount: 10
+X-message-linecount: 12
 X-received-count: 2
 
 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
diff --git a/test/mail/1001.userx b/test/mail/1001.userx
index 5eac31059..8801e5898 100644
--- a/test/mail/1001.userx
+++ b/test/mail/1001.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
@@ -11,7 +12,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
@@ -20,7 +22,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] (helo=[IPV6:V6NET:0:12:1:a00:20ff:fe86:a062])
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@test.ex
 
 EHLO [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062]
diff --git a/test/mail/1103.userx b/test/mail/1103.userx
index 66c128b68..c3b33db1d 100644
--- a/test/mail/1103.userx
+++ b/test/mail/1103.userx
@@ -4,7 +4,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
 	(Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
 This is a test encrypted message.
diff --git a/test/mail/1104.userx b/test/mail/1104.userx
index 232d7a7d6..88e6b103f 100644
--- a/test/mail/1104.userx
+++ b/test/mail/1104.userx
@@ -3,7 +3,8 @@ Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher= peerdn=
 
 This is a test unencrypted message.
diff --git a/test/mail/1110.userx b/test/mail/1110.userx
index b0fce8611..ad6260fcc 100644
--- a/test/mail/1110.userx
+++ b/test/mail/1110.userx
@@ -4,7 +4,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
 	(Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''
 
 This is a test encrypted message.
@@ -15,7 +16,8 @@ Received: from [ip4.ip4.ip4.ip4]
 	(Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn 'CN=Phil Pennock'
 
 This is a test encrypted message from a verified host.
diff --git a/test/mail/1150.CALLER b/test/mail/1150.CALLER
index f7669bdbc..c130ffb97 100644
--- a/test/mail/1150.CALLER
+++ b/test/mail/1150.CALLER
@@ -4,11 +4,13 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for CALLER@test.ex;
+	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
@@ -21,10 +23,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1150.abcd b/test/mail/1150.abcd
index 8a6aae2cc..ef2608219 100644
--- a/test/mail/1150.abcd
+++ b/test/mail/1150.abcd
@@ -4,10 +4,12 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for abcd@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1150.xyz b/test/mail/1150.xyz
index e304d943c..c605749eb 100644
--- a/test/mail/1150.xyz
+++ b/test/mail/1150.xyz
@@ -3,10 +3,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1157.usera b/test/mail/1157.usera
index 8aac112ac..02e9c1cf4 100644
--- a/test/mail/1157.usera
+++ b/test/mail/1157.usera
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbG-0005vi-00
-	for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usera@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for usera@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usera@test.ex;
+	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
diff --git a/test/mail/1157.userb b/test/mail/1157.userb
index 0a98cd802..cbcb038ef 100644
--- a/test/mail/1157.userb
+++ b/test/mail/1157.userb
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbI-0005vi-00
-	for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userb@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for userb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userb@test.ex;
+	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
diff --git a/test/mail/1157.userc b/test/mail/1157.userc
index efb32a668..25282194d 100644
--- a/test/mail/1157.userc
+++ b/test/mail/1157.userc
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbH-0005vi-00
-	for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userc@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00
-	for userc@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userc@test.ex;
+	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/1157.userx b/test/mail/1157.userx
index f720f911a..d8c122758 100644
--- a/test/mail/1157.userx
+++ b/test/mail/1157.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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/1157.usery b/test/mail/1157.usery
index 32797e12f..244523d5e 100644
--- a/test/mail/1157.usery
+++ b/test/mail/1157.usery
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for usery@test.ex;
+	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
diff --git a/test/mail/1157.userz b/test/mail/1157.userz
index 919c86d23..60280939e 100644
--- a/test/mail/1157.userz
+++ b/test/mail/1157.userz
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	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/1159.userx b/test/mail/1159.userx
index 1a86c2aa7..2062ab0ed 100644
--- a/test/mail/1159.userx
+++ b/test/mail/1159.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -22,11 +24,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/1160.CALLER b/test/mail/1160.CALLER
index f7669bdbc..c130ffb97 100644
--- a/test/mail/1160.CALLER
+++ b/test/mail/1160.CALLER
@@ -4,11 +4,13 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for CALLER@test.ex;
+	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
@@ -21,10 +23,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1160.abcd b/test/mail/1160.abcd
index 8a6aae2cc..ef2608219 100644
--- a/test/mail/1160.abcd
+++ b/test/mail/1160.abcd
@@ -4,10 +4,12 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for abcd@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1160.xyz b/test/mail/1160.xyz
index e304d943c..c605749eb 100644
--- a/test/mail/1160.xyz
+++ b/test/mail/1160.xyz
@@ -3,10 +3,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1163.userx0 b/test/mail/1163.userx0
index 5d80e9866..c624c2be9 100644
--- a/test/mail/1163.userx0
+++ b/test/mail/1163.userx0
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx0@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaX-0005vi-00;
+	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/1163.userx1 b/test/mail/1163.userx1
index 1acf09c8f..4b6fd69d7 100644
--- a/test/mail/1163.userx1
+++ b/test/mail/1163.userx1
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for userx1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaX-0005vi-00;
+	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/1163.usery0 b/test/mail/1163.usery0
index 6030779c8..c7c6496e1 100644
--- a/test/mail/1163.usery0
+++ b/test/mail/1163.usery0
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for usery0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery0@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1163.usery1 b/test/mail/1163.usery1
index e1b08c6ad..fa57c65fe 100644
--- a/test/mail/1163.usery1
+++ b/test/mail/1163.usery1
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00
-	for usery1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/mail/1163.userz0 b/test/mail/1163.userz0
index 9f4558735..9f7222357 100644
--- a/test/mail/1163.userz0
+++ b/test/mail/1163.userz0
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userz0@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz0@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaZ-0005vi-00;
+	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/1163.userz1 b/test/mail/1163.userz1
index 17e3991b0..fad66960c 100644
--- a/test/mail/1163.userz1
+++ b/test/mail/1163.userz1
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for userz1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	id 10HmaZ-0005vi-00;
+	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/2002.CALLER b/test/mail/2002.CALLER
index dc634d1e9..adeef5a8d 100644
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -4,7 +4,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -16,7 +17,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <"name with spaces"@test.ex>)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -28,7 +30,8 @@ Received: from [ip4.ip4.ip4.ip4]
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=CN=server2.example.com
 
@@ -40,7 +43,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -53,7 +57,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbB-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx peerdn=
 
diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 08f034e29..4986bb683 100644
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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/2027.usery b/test/mail/2027.usery
index e76df9b2f..c2801d9fa 100644
--- a/test/mail/2027.usery
+++ b/test/mail/2027.usery
@@ -3,11 +3,13 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for usery@test.ex;
+	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
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 4f3810356..13dcbf247 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -4,7 +4,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <a@test.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -16,7 +17,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <"name with spaces"@test.ex>)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -28,7 +30,8 @@ Received: from [ip4.ip4.ip4.ip4]
 	(Exim x.yz)
 	(envelope-from <b@test.ex>)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
 
@@ -40,7 +43,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <c@test.ex>)
 	id 10HmbA-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx peerdn=
 
diff --git a/test/mail/2127.userx b/test/mail/2127.userx
index 08f034e29..4986bb683 100644
--- a/test/mail/2127.userx
+++ b/test/mail/2127.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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/2127.usery b/test/mail/2127.usery
index e76df9b2f..c2801d9fa 100644
--- a/test/mail/2127.usery
+++ b/test/mail/2127.usery
@@ -3,11 +3,13 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for usery@test.ex;
+	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
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 1edd49384..4e35082dc 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -4,7 +4,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -16,7 +17,8 @@ Received: from [127.0.0.1]
 	(Exim x.yz)
 	(envelope-from <"name with spaces"@test.ex>)
 	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
@@ -28,7 +30,8 @@ Received: from [ip4.ip4.ip4.ip4]
 	(Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server1.example.com
 
diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index 06590b3e7..72c9a3f6f 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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/2600.userx b/test/mail/2600.userx
index 3e636bdb3..6b7d1595c 100644
--- a/test/mail/2600.userx
+++ b/test/mail/2600.userx
@@ -2,7 +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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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/2610.ph10 b/test/mail/2610.ph10
index 3305d49bb..710994474 100644
--- a/test/mail/2610.ph10
+++ b/test/mail/2610.ph10
@@ -2,7 +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
-	for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for ph10@myhost.test.ex;
+	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/2620.ph10 b/test/mail/2620.ph10
index 1e1294c18..bd5306cfa 100644
--- a/test/mail/2620.ph10
+++ b/test/mail/2620.ph10
@@ -2,7 +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
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	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/3400.userx b/test/mail/3400.userx
index bde3d2210..84768881a 100644
--- a/test/mail/3400.userx
+++ b/test/mail/3400.userx
@@ -6,7 +6,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
 	by myhost.test.ex with esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing unauthenticated.
 
@@ -18,7 +19,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing unauthenticated (2).
 
@@ -30,7 +32,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: mylogin
 
 Testing authenticated.
@@ -43,7 +46,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: mylogin
 X-Authenticated-Sender: auth@cus.cam.ac.uk
 
@@ -57,7 +61,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
 	by myhost.test.ex with esmtpa (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: mylogin
 
 Testing authenticated (3).
@@ -70,7 +75,8 @@ Received: from [10.0.0.1] (helo=test.host ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <userx@cus.cam.ac.uk>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: login
 X-Authenticated-ID: userx
 
@@ -84,7 +90,8 @@ Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 authentication-failed: 0
 
 Without authenticating
@@ -97,7 +104,8 @@ Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 authentication-failed: 0
 X-Host-Authenticated: mylogin
 
@@ -111,7 +119,8 @@ Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbF-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 authentication-failed: 1
 X-Host-Authenticated: mylogin
 
diff --git a/test/mail/3403.userx b/test/mail/3403.userx
index 9ec9b79b7..1b07e25e6 100644
--- a/test/mail/3403.userx
+++ b/test/mail/3403.userx
@@ -5,7 +5,8 @@ Received: from CALLER (helo=testing.ex)
 	by myhost.test.ex with local-esmtpa (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
+	for userx@test.ex;
+	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/3411.postmaster b/test/mail/3411.postmaster
index db8f9026e..215795d8b 100644
--- a/test/mail/3411.postmaster
+++ b/test/mail/3411.postmaster
@@ -2,7 +2,8 @@ From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [10.0.0.0] (helo=rhu.barb ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 6
 
diff --git a/test/mail/3411.userx b/test/mail/3411.userx
index db8f9026e..215795d8b 100644
--- a/test/mail/3411.userx
+++ b/test/mail/3411.userx
@@ -2,7 +2,8 @@ From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [10.0.0.0] (helo=rhu.barb ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 6
 
diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index b9df8e528..3395cdff7 100644
--- a/test/mail/3451.userx
+++ b/test/mail/3451.userx
@@ -4,17 +4,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -28,17 +31,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 6116a01db..0c021c7c3 100644
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -22,11 +24,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index b9df8e528..3395cdff7 100644
--- a/test/mail/3461.userx
+++ b/test/mail/3461.userx
@@ -4,17 +4,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -28,17 +31,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/3462.userx b/test/mail/3462.userx
index 6116a01db..0c021c7c3 100644
--- a/test/mail/3462.userx
+++ b/test/mail/3462.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
@@ -22,11 +24,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for userx@test.ex;
+	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
diff --git a/test/mail/3500.userx b/test/mail/3500.userx
index c6910af8a..f6f87947c 100644
--- a/test/mail/3500.userx
+++ b/test/mail/3500.userx
@@ -6,7 +6,8 @@ Received: from [10.0.0.1] (helo=test.host ident=CALLER)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <userx@some.domain>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: cram_md5
 X-Authenticated-ID: tim
 
diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps
index 66d2afe48..f844cf206 100644
--- a/test/mail/3700.smtps
+++ b/test/mail/3700.smtps
@@ -7,11 +7,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <ok@test.ex>)
 	id 10HmbA-0005vi-00
-	for smtps@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for smtps@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test.ex>)
 	id 10HmaY-0005vi-00
-	for smtps@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for smtps@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: ok@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3700.x b/test/mail/3700.x
index d520cfe15..8e8250815 100644
--- a/test/mail/3700.x
+++ b/test/mail/3700.x
@@ -7,11 +7,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	(Exim x.yz)
 	(envelope-from <ok@test.ex>)
 	id 10HmaZ-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test.ex>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: ok@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4000.userx b/test/mail/4000.userx
index 92776edde..0712716b9 100644
--- a/test/mail/4000.userx
+++ b/test/mail/4000.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@test.ex>
 To: a-list00@exim.org
@@ -136,7 +137,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@test.ex>
 To: a-list00@exim.org
@@ -185,7 +187,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@test.ex>
 To: a-list00@exim.org
@@ -223,7 +226,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@test.ex>
 To: a-list00@exim.org
@@ -259,7 +263,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@test.ex>
 To: a-list00@exim.org
@@ -300,7 +305,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-ID: <20041217133501.GA3058@test.ex>
 Subject: Nasty5
@@ -366,7 +372,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@test.ex>
 To: a-list00@exim.org
diff --git a/test/mail/4002.userx b/test/mail/4002.userx
index 59fa44af8..6bc565c3f 100644
--- a/test/mail/4002.userx
+++ b/test/mail/4002.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: Test person <tp@cam.ac.uk>
 To: Me <userx@test.ex>
 Subject: A real test message
@@ -18,7 +19,8 @@ Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: Test person <tp@cam.ac.uk>
 To: Me <userx@test.ex>
 Subject: A real test message
diff --git a/test/mail/4203.यहलोगहिन�दीक�योंनहींबोलसकतेहैं b/test/mail/4203.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
index b93a5b26f..34a2b79a0 100644
--- a/test/mail/4203.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
+++ b/test/mail/4203.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
@@ -4,7 +4,8 @@ Envelope-to: यहलोगहिनà¥�दीकà¥�योंनहींबोà
 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 यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local; Tue, 2 Mar 1999 09:44:33 +0000
+	for यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
@@ -46,7 +47,8 @@ Received: from CALLER (helo=client.ffail)
 	by the.local.host.name with utf8local-esmtp (Exim x.yz)
 	(envelope-from <यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local>)
 	id 10HmaX-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local
diff --git a/test/mail/4213.यहलोगहिन�दीक�योंनहींबोलसकतेहैं b/test/mail/4213.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
index b93a5b26f..34a2b79a0 100644
--- a/test/mail/4213.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
+++ b/test/mail/4213.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
@@ -4,7 +4,8 @@ Envelope-to: यहलोगहिनà¥�दीकà¥�योंनहींबोà
 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 यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local; Tue, 2 Mar 1999 09:44:33 +0000
+	for यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
@@ -46,7 +47,8 @@ Received: from CALLER (helo=client.ffail)
 	by the.local.host.name with utf8local-esmtp (Exim x.yz)
 	(envelope-from <यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local>)
 	id 10HmaX-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local
diff --git a/test/mail/4223.यहलोगहिन�दीक�योंनहींबोलसकतेहैं b/test/mail/4223.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
index b93a5b26f..34a2b79a0 100644
--- a/test/mail/4223.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
+++ b/test/mail/4223.यहलोगहिन�दीक�योंनहींबोलसकतेहैं
@@ -4,7 +4,8 @@ Envelope-to: यहलोगहिनà¥�दीकà¥�योंनहींबोà
 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 यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local; Tue, 2 Mar 1999 09:44:33 +0000
+	for यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
@@ -46,7 +47,8 @@ Received: from CALLER (helo=client.ffail)
 	by the.local.host.name with utf8local-esmtp (Exim x.yz)
 	(envelope-from <यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local>)
 	id 10HmaX-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: यहलोगहिन�दीक�योंनहींबोलसकतेहैं@japanese.���ん�日本語を話���れ����.local
diff --git a/test/mail/4520.a b/test/mail/4520.a
index 94fd9a45f..39d075866 100644
--- a/test/mail/4520.a
+++ b/test/mail/4520.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=LygSZ5OCGlY
 	/fF+ReGidcyXZw1l+NbhyXEkQYrSrQV/BqEL34Ql4v7PS6BPwkkdSojQ+b6vZUKwiFV5SoWb81N06
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 From: second@example.com
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/mail/4520.b b/test/mail/4520.b
index b80dc7185..9fb69146d 100644
--- a/test/mail/4520.b
+++ b/test/mail/4520.b
@@ -3,14 +3,16 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;
 	t=T; x=T+10; b=bbbb;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4520.b10 b/test/mail/4520.b10
index de3c9cd5c..9b33d6fcf 100644
--- a/test/mail/4520.b10
+++ b/test/mail/4520.b10
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for b10@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b10@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
 	7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for b10@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b10@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4520.b12 b/test/mail/4520.b12
index 392cee332..b41f7e515 100644
--- a/test/mail/4520.b12
+++ b/test/mail/4520.b12
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00
-	for b12@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b12@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=X-mine:X-mine:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;
 	b=VSF3Fmf7fHLpqKWgaG0t/RJdd+7JJNRN/+q7Gcz0xtIOjt5tL4Pfc4VDSeQYPq6e1pCcjvj79k5
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for b12@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b12@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 X-mine: one
 X-mine: two
diff --git a/test/mail/4520.b20 b/test/mail/4520.b20
index cc84e7840..02da74c7e 100644
--- a/test/mail/4520.b20
+++ b/test/mail/4520.b20
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbH-0005vi-00
-	for b20@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b20@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=X-Mine; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=VJ0NOLNRm
 	RSvCCwV1TxNy+33gc34TrxCjTDl12GiW4E1N92MQwuhgzUPStxZDI+A8BqK/OFovhEwz775NfUgAz
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbG-0005vi-00
-	for b20@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b20@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4520.b22 b/test/mail/4520.b22
index 2b1e433e0..bf687ffdb 100644
--- a/test/mail/4520.b22
+++ b/test/mail/4520.b22
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbJ-0005vi-00
-	for b22@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b22@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=X-mine:X-mine:X-Mine;
 	bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=xdhDHWeO9R0K1mMCManMqUGXH3
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbI-0005vi-00
-	for b22@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b22@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 X-mine: one
 X-mine: two
diff --git a/test/mail/4520.d b/test/mail/4520.d
index df5ea5099..b8b5aec98 100644
--- a/test/mail/4520.d
+++ b/test/mail/4520.d
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbL-0005vi-00
-	for d@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for d@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel_bad; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=pL614V/
 	QAEOFdf403ELt483LzdOxQoo+jSheIIOxccgWFWz7HRjVGASRCU20k2GlYfRomm/tVkp+vf1yw6Oj
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbK-0005vi-00
-	for d@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for d@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4520.e b/test/mail/4520.e
index 5cc5bb8f4..3b9931e1d 100644
--- a/test/mail/4520.e
+++ b/test/mail/4520.e
@@ -3,11 +3,13 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbN-0005vi-00
-	for e@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for e@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbM-0005vi-00
-	for e@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for e@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4520.f b/test/mail/4520.f
index 4e6d96d08..cc8bc6306 100644
--- a/test/mail/4520.f
+++ b/test/mail/4520.f
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbP-0005vi-00
-	for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for f@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=gs+F4Uhr+N4qZhWyfctULkCwprl/tvOnzqNhsmpAFW4=; b=A3l0nyvB3OK
 	NuIDfQJg0wynUUH4AWSRdDUNmhkTNo2RW/ifLCWBky6AXfkaHENJRewncjoVcn92d0cbTF4gDEhUi
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbO-0005vi-00
-	for f@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for f@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4523.a b/test/mail/4523.a
index bfe40459b..ea00a459b 100644
--- a/test/mail/4523.a
+++ b/test/mail/4523.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha512; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From:From; bh=6B2m0DINYQYGHTvmDYQAfAm/wCDFh+Oj57jE2G4jz4nAeJfmjTB6tz
 	me+A5nT6AQ4J3N47vffXLG1exv8bzFZw==; b=YFIC4khvqvXRd8I3r3YTdQqG/SbtDIAYTYVkIo3
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha512; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 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
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4524.c b/test/mail/4524.c
index 92d09afb7..8e61da1da 100644
--- a/test/mail/4524.c
+++ b/test/mail/4524.c
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=ses; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=
 	hjRHwrwAxKFsul1+Bj1XU0YSi0cMQO5hzSItwtaAP++3E9DdxAzeenuRmCyL4o5NQSWY9gMArptRz
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4525.a b/test/mail/4525.a
index 2f78aec6e..7a8b89cd0 100644
--- a/test/mail/4525.a
+++ b/test/mail/4525.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
 	7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 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
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4525.b b/test/mail/4525.b
index 6cd2538e0..e47b388eb 100644
--- a/test/mail/4525.b
+++ b/test/mail/4525.b
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
 	wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
@@ -29,7 +31,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
 	wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -38,7 +41,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4525.c b/test/mail/4525.c
index 1032c0d83..a908d75ed 100644
--- a/test/mail/4525.c
+++ b/test/mail/4525.c
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
 	wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
@@ -29,7 +31,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbG-0005vi-00
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
 	wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -38,7 +41,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbF-0005vi-00
-	for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for c@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4530.y b/test/mail/4530.y
index 35543799b..8b932d642 100644
--- a/test/mail/4530.y
+++ b/test/mail/4530.y
@@ -3,7 +3,8 @@ Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
 	by testhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for y@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for y@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D
 	sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape
@@ -13,10 +14,11 @@ Received: from [127.0.0.1] (helo=xxx)
 	by testhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbA-0005vi-00
-	for y@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for y@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: simple test
 X-body-linecount: 0
-X-message-linecount: 15
+X-message-linecount: 17
 X-received-count: 2
 
 Line 1: This is a simple test.
diff --git a/test/mail/4530.z b/test/mail/4530.z
index f81ae7b01..777e6a6ef 100644
--- a/test/mail/4530.z
+++ b/test/mail/4530.z
@@ -3,7 +3,8 @@ Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
 	by testhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for z@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for z@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D
 	sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape
@@ -13,10 +14,11 @@ Received: from [127.0.0.1] (helo=xxx)
 	by testhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaZ-0005vi-00
-	for z@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for z@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: simple test
 X-body-linecount: 0
-X-message-linecount: 15
+X-message-linecount: 17
 X-received-count: 2
 
 Line 1: This is a simple test.
diff --git a/test/mail/4541.a b/test/mail/4541.a
index e1c95f022..660be9452 100644
--- a/test/mail/4541.a
+++ b/test/mail/4541.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
 	7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 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
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4541.b b/test/mail/4541.b
index 7927bbc46..9f073d968 100644
--- a/test/mail/4541.b
+++ b/test/mail/4541.b
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 	s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
 	7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4545.a b/test/mail/4545.a
index 18752a778..8b5ce8fe0 100644
--- a/test/mail/4545.a
+++ b/test/mail/4545.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 	; s=sed; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; 
 	b=5fhyD3EILDrnL4DnkD4hDaeis7+GSzL9GMHrhIDZJjuJ00WD5iI8SQ1q9rDfzFL/Kdw0VIyB4RD
@@ -11,7 +12,8 @@ DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 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
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4545.b b/test/mail/4545.b
index 80f6e490c..e64441cb3 100644
--- a/test/mail/4545.b
+++ b/test/mail/4545.b
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 	; s=sed; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=IKNwoUbCe
 	ayHoA7j2L0IU1IFuapa3DrlNx9wPlBodM1iKJ57WGibKzefQNdTjymHPsMlQ9fS+h9ZSsHmVNBdDA
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for b@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/mail/4550.store b/test/mail/4550.store
index 74d13383e..2d576cbf4 100644
--- a/test/mail/4550.store
+++ b/test/mail/4550.store
@@ -3,10 +3,12 @@ Return-path: <>
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: baduser@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -47,7 +49,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@example.com
 From: second@example.com
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/mail/4560.a b/test/mail/4560.a
index 571555397..b03021916 100644
--- a/test/mail/4560.a
+++ b/test/mail/4560.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
         xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
         YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
@@ -34,7 +35,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaZ-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
 	 b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
 	  AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -53,7 +55,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaY-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
 
 This is a test body.
@@ -66,7 +69,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbC-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
 	 b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy
 	  u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6
@@ -87,7 +91,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbB-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
 	 b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
 	  AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -106,7 +111,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbA-0005vi-00
-	for zza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for zza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
 
 This is a test body.
@@ -119,7 +125,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbG-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=3; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
 	 b=advgCcXZhwJFZi5rzQgnThsSOX6MsCpnXWxyub3UbuQI5RonZOw7SwEVJ2j4Q32z1d54wws1/c
 	  2MJeB2ChZUy+J0rNrXLEWsZZtOrQDx1fEaGL7sXC8RYshnkboBiN8lbkuoZHUZWPILKIWd5V2M
@@ -140,7 +147,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbF-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
 	 b=odwQlZ9ZCMTWG30i3IPycNo+3kLWIngjWVJKGF8d8CfNEIEeK7ao89Wy9bPEwcnXHYN2HnDjtL
 	  UXPiuo0BLPS4UCAvVdBd1Kr/rUHfoIysIFF6OggChI2ZeUqRlkD1GRV7C5LACsDrGR+HQQzXPI
@@ -161,7 +169,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbE-0005vi-00
-	for mza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for mza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
 	 b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
 	  AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -180,7 +189,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbD-0005vi-00
-	for zmza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for zmza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
 
 This is a test body.
@@ -197,7 +207,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbL-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=3; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
 	 b=SwyS6CAxe1WUpQ6/gjhehp05c2J3qn5TgqiEzNZENLQ0LmoFesan/Hs/WUXsu68TWbk12zSYGl
 	  j8SymB40wpTVbyI0nB9X3f/EV35apVdZCCbb7fhDcItiaveQAYAQjupnD1Gzf7bvkFnHUNIyvc
@@ -218,7 +229,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbK-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
 	iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
 	arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
@@ -226,7 +238,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbJ-0005vi-00
-	for mza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for mza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
 	 b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy
 	  u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6
@@ -247,7 +260,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbI-0005vi-00
-	for zmza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for zmza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
 	 b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
 	  AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -266,7 +280,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbH-0005vi-00
-	for zzmza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for zzmza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
 
 This is a test body.
@@ -283,7 +298,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbO-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
 	iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
 	arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
@@ -291,7 +307,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbN-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
 	 b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
 	  AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -310,7 +327,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbM-0005vi-00
-	for zza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for zza@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
 
 This is a test body.
@@ -326,7 +344,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbQ-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
 	 b=e1ldkzDyxJIvQd+ZOylCkekKOj3WVUZiptsJYuoiM0tsBRoiHA5O6RDwrNzCQxRWT05PzW3GBy
 	  Dkiejo2w30n9QBueQH4h8BvCl/QMlmmdaIy02ZKqfvtp1hxR125TREXdigK9ULQZF4rIrDma5S
@@ -353,7 +372,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbP-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from dragon.trusteddomain.org (localhost [127.0.0.1])
 	by dragon.trusteddomain.org (8.14.5/8.14.5) with ESMTP id w121YG2q036577;
 	Tue, 2 Mar 1999 09:44:33 +0000 (PST)
@@ -487,14 +507,16 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbS-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
 	arc=none
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmbR-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
 
 This is a test body.
diff --git a/test/mail/4561.a b/test/mail/4561.a
index 38b81af1e..127c29afb 100644
--- a/test/mail/4561.a
+++ b/test/mail/4561.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=none; a=rsa-sha256; d=test.ex; s=r201803;
       b=HxjMzNcj7OX+I9Vr1Xr14AGgAci/CI8JxspaeoNT7TBsiOAtZ+YDBBSqXe6fqX3mHQEwpnXrdz
        PCMIU1SF3ZiBtqWaLBPhStfuNQl5cw+TWXC60rOwCD2bxuBqubM/3AZLMPzIpm62MUYUUGaxwi
diff --git a/test/mail/4562.a b/test/mail/4562.a
index 4a83ce6ac..aa346da3a 100644
--- a/test/mail/4562.a
+++ b/test/mail/4562.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <has_arc@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
         xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
         YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
@@ -33,7 +34,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <no_arc@bloggs.com>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: mrgus@text.ex
 To: bakawolf@yahoo.com
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4563.a b/test/mail/4563.a
index e4082a540..4b831d8c8 100644
--- a/test/mail/4563.a
+++ b/test/mail/4563.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
         xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
         YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
diff --git a/test/mail/4565.a b/test/mail/4565.a
index 7346a7c2e..9efab94d3 100644
--- a/test/mail/4565.a
+++ b/test/mail/4565.a
@@ -9,7 +9,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaY-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
 	 b=1J94ImExSjtnwHY/c/aN3BX/xlnQfi6CPdGQvbeSdsbCCEtOqK9547tA54tYFh8beeVECAR0xu
 	  9fCSAjZ/0WM7mrxKNMbWkoHNoejUhNkcxJOtFmiS/0JKPQGk8HTE7FHLbogUQvEJoVBBnqo6xW
@@ -41,7 +42,8 @@ Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for za@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 	d=example.com; s=sel; h=List-Archive;
 	 bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=uslVEq1LzHDR2ACoSTiErsGhe
diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index f42604b3c..86a94783d 100644
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -2,10 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
 	by the.local.host.name with esmtp (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex;
+	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 SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
@@ -45,11 +47,13 @@ Received: from localhost ([127.0.0.1] helo=the.local.host.name)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for remote_user@remote.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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 redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for redirect@test.ex;
+	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
diff --git a/test/mail/4620.fred[ b/test/mail/4620.fred[
index 3a6cf1f46..8482b0013 100644
--- a/test/mail/4620.fred[
+++ b/test/mail/4620.fred[
@@ -2,10 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
 	by the.local.host.name with esmtp (Exim x.yz)
 	id 10HmbE-0005vi-00
-	for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex;
+	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 "SRS0=ZZZZ=YY=test.ex=fred["@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for "SRS0=ZZZZ=YY=test.ex=fred["@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
@@ -45,11 +47,13 @@ Received: from localhost ([127.0.0.1] helo=the.local.host.name)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <"SRS0=ZZZZ=YY=test.ex=fred["@test.ex>)
 	id 10HmbC-0005vi-00
-	for remote_user@remote.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for remote_user@remote.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by the.local.host.name with local (Exim x.yz)
 	(envelope-from <"fred["@test.ex>)
 	id 10HmbB-0005vi-00
-	for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for redirect@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: "fred["@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4700.CALLER b/test/mail/4700.CALLER
index dd396d93d..378b05d7e 100644
--- a/test/mail/4700.CALLER
+++ b/test/mail/4700.CALLER
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -48,7 +49,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 10HmaX-0005vi-00
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	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
@@ -61,7 +63,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
@@ -122,7 +125,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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/5000.new/1.myhost.test.ex b/test/mail/5000.new/1.myhost.test.ex
index efa7079ca..f960a63f9 100644
--- a/test/mail/5000.new/1.myhost.test.ex
+++ b/test/mail/5000.new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 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
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/5000.new/2.myhost.test.ex b/test/mail/5000.new/2.myhost.test.ex
index e2afa21cd..2f30d1c37 100644
--- a/test/mail/5000.new/2.myhost.test.ex
+++ b/test/mail/5000.new/2.myhost.test.ex
@@ -1,7 +1,8 @@
 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
+	for userx@myhost.test.ex;
+	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/5000.new/3.myhost.test.ex:S370 b/test/mail/5000.new/3.myhost.test.ex:S370
index 722505641..e178ce3df 100644
--- a/test/mail/5000.new/3.myhost.test.ex:S370
+++ b/test/mail/5000.new/3.myhost.test.ex:S370
@@ -2,7 +2,8 @@ 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 10HmbB-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
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 d7b4768aa..f712cb97f 100644
--- a/test/mail/5000.new/4.myhost.test.ex,S=370
+++ b/test/mail/5000.new/4.myhost.test.ex,S=370
@@ -2,7 +2,8 @@ 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 10HmbC-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/5000.new/5.myhost.test.ex b/test/mail/5000.new/5.myhost.test.ex
index 41aedbcd8..0560db7de 100644
--- a/test/mail/5000.new/5.myhost.test.ex
+++ b/test/mail/5000.new/5.myhost.test.ex
@@ -2,7 +2,8 @@ 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 10HmbD-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
diff --git a/test/mail/5000.new/6.myhost.test.ex b/test/mail/5000.new/6.myhost.test.ex
index a7210d10f..fc641280a 100644
--- a/test/mail/5000.new/6.myhost.test.ex
+++ b/test/mail/5000.new/6.myhost.test.ex
@@ -2,7 +2,8 @@ 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 10HmbE-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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
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 f33b5f27f..1368a85b2 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
@@ -2,7 +2,8 @@ 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 10HmbF-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	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/5002.new/1.myhost.test.ex b/test/mail/5002.new/1.myhost.test.ex
index 4b8954864..09a065ba5 100644
--- a/test/mail/5002.new/1.myhost.test.ex
+++ b/test/mail/5002.new/1.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5004.new/1.mail.test.ex b/test/mail/5004.new/1.mail.test.ex
index 88be14504..64bf2de0f 100644
--- a/test/mail/5004.new/1.mail.test.ex
+++ b/test/mail/5004.new/1.mail.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5005.nofile/new/1.myhost.test.ex b/test/mail/5005.nofile/new/1.myhost.test.ex
index 5da3db575..e55556a44 100644
--- a/test/mail/5005.nofile/new/1.myhost.test.ex
+++ b/test/mail/5005.nofile/new/1.myhost.test.ex
@@ -1,7 +1,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
+	for nofile@test.ex;
+	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/5005.userx/new/2.myhost.test.ex b/test/mail/5005.userx/new/2.myhost.test.ex
index dcb7049b8..d579408ac 100644
--- a/test/mail/5005.userx/new/2.myhost.test.ex
+++ b/test/mail/5005.userx/new/2.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5006.userx/new/1.myhost.test.ex b/test/mail/5006.userx/new/1.myhost.test.ex
index 4db91ee5a..225c17107 100644
--- a/test/mail/5006.userx/new/1.myhost.test.ex
+++ b/test/mail/5006.userx/new/1.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5007.userx/new/1.myhost.test.ex b/test/mail/5007.userx/new/1.myhost.test.ex
index c077e2b7e..58437c9a1 100644
--- a/test/mail/5007.userx/new/1.myhost.test.ex
+++ b/test/mail/5007.userx/new/1.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5010.new/1.myhost.test.ex b/test/mail/5010.new/1.myhost.test.ex
index 4b8954864..09a065ba5 100644
--- a/test/mail/5010.new/1.myhost.test.ex
+++ b/test/mail/5010.new/1.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5012.new/1.myhost.test.ex b/test/mail/5012.new/1.myhost.test.ex
index 4b8954864..09a065ba5 100644
--- a/test/mail/5012.new/1.myhost.test.ex
+++ b/test/mail/5012.new/1.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5012.new/2.myhost.test.ex b/test/mail/5012.new/2.myhost.test.ex
index ffc6a3bf8..9cc907d9d 100644
--- a/test/mail/5012.new/2.myhost.test.ex
+++ b/test/mail/5012.new/2.myhost.test.ex
@@ -1,7 +1,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
+	for userx@test.ex;
+	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/5050.userx b/test/mail/5050.userx
index 2b5ed9885..9d0e91c67 100644
--- a/test/mail/5050.userx
+++ b/test/mail/5050.userx
@@ -5,7 +5,8 @@ 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 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
@@ -19,7 +20,8 @@ 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
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	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
diff --git a/test/mail/5050.usery b/test/mail/5050.usery
index fd87afe8a..d39c10bfd 100644
--- a/test/mail/5050.usery
+++ b/test/mail/5050.usery
@@ -5,7 +5,8 @@ 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 10HmaZ-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	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/5050.userz b/test/mail/5050.userz
index 75b251f9f..aa3fcbc71 100644
--- a/test/mail/5050.userz
+++ b/test/mail/5050.userz
@@ -5,7 +5,8 @@ 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 10HmbA-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	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
@@ -19,7 +20,8 @@ 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 10HmbB-0005vi-00

-	for mbx_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+	for mbx_userz@test.ex;

+	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

@@ -32,7 +34,8 @@ 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 10HmbC-0005vi-00
-	for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@test.ex;
+	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
diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index 85470f9b9..5956705b4 100644
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -3,7 +3,8 @@ Envelope-to: userx@myhost.test.ex,
  jill@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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 mailbox: copied
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -17,7 +18,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: jack@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -57,7 +59,8 @@ Content-type: message/rfc822
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 mailbox: copied
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -71,7 +74,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: jack@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -111,7 +115,8 @@ Content-type: message/rfc822
 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
+	id 10HmaZ-0005vi-00;
+	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/5200.postmaster b/test/mail/5200.postmaster
index b278ac42f..4951889c8 100644
--- a/test/mail/5200.postmaster
+++ b/test/mail/5200.postmaster
@@ -4,7 +4,8 @@ Envelope-to: postmaster@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
diff --git a/test/mail/5203.userx b/test/mail/5203.userx
index 1cb2875ec..932e2f121 100644
--- a/test/mail/5203.userx
+++ b/test/mail/5203.userx
@@ -2,7 +2,8 @@ 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
-	for userx@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@remote.domain;
+	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/5204.CALLER b/test/mail/5204.CALLER
index dce7a8350..82f00cd3b 100644
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -1,7 +1,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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@some.host
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -40,7 +41,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
-	for "FAIL cannot route this one (FAIL)"@some.host; Tue, 2 Mar 1999 09:44:33 +0000
+	for "FAIL cannot route this one (FAIL)"@some.host;
+	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/5207.qpgm b/test/mail/5207.qpgm
index da024f7a8..746f640a2 100644
--- a/test/mail/5207.qpgm
+++ b/test/mail/5207.qpgm
@@ -1,7 +1,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
+	id 10HmaX-0005vi-00;
+	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
@@ -10,7 +11,8 @@ 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
+	id 10HmaX-0005vi-00;
+	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/5500.user1 b/test/mail/5500.user1
index a485c7c91..19df9b5e4 100644
--- a/test/mail/5500.user1
+++ b/test/mail/5500.user1
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for user1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for user1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@some.where
 
 
diff --git a/test/mail/5500.userx b/test/mail/5500.userx
index 59fd89bba..e5ea8bdb2 100644
--- a/test/mail/5500.userx
+++ b/test/mail/5500.userx
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@some.where
 
 
@@ -9,7 +10,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@some.where
 
 
diff --git a/test/mail/5902.user1 b/test/mail/5902.user1
index 6cc3901e6..ecb5864b8 100644
--- a/test/mail/5902.user1
+++ b/test/mail/5902.user1
@@ -2,7 +2,8 @@ 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
-	for user1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for user1@test.ex;
+	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/rejectlog/0021 b/test/rejectlog/0021
index 3dbf53292..daf9ee5c9 100644
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -4,7 +4,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: ok@test2
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -24,7 +26,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: ok@test4
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +45,8 @@ Envelope-to: <userx@test.ex>
 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
+	for userx@test.ex;
+	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
@@ -52,7 +56,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 3a6ff66a9..96682c4f3 100644
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -4,7 +4,8 @@ Envelope-to: <x@y>
 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
+	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
@@ -14,7 +15,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: <dummy@gmail.com
   Subject: incomprehensible
 F From: <forged@sender.com
@@ -25,7 +27,8 @@ 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
+	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
@@ -34,7 +37,8 @@ Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <x@y>
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -45,7 +49,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbB-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: x@y
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -54,7 +59,8 @@ Envelope-from: <>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T to: group name: x@y, p@q;
 R reply-to: group name:;
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index b80e61635..9ae0806fb 100644
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -12,7 +12,8 @@ Envelope-from: <>
 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
+	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
@@ -21,7 +22,8 @@ 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
+	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
@@ -30,7 +32,8 @@ 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
+	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
diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 32a9d0576..1e5600b4f 100644
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -4,7 +4,8 @@ Envelope-to: <userx@test.ex>
 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
+	for userx@test.ex;
+	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/0162 b/test/rejectlog/0162
index 515596920..89361d318 100644
--- a/test/rejectlog/0162
+++ b/test/rejectlog/0162
@@ -4,7 +4,8 @@ Envelope-to: <u3@test.ex>
 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 u3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for u3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: <u5@compuserve.com>,
   <u6@emory.org>,
   <u7@hotmail.com>,
diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index 5cdd84c43..59443bddb 100644
--- a/test/rejectlog/0214
+++ b/test/rejectlog/0214
@@ -7,7 +7,8 @@ P Received: from [127.0.0.1]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaX-0005vi-00
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: Me <x@y.z>
   Comment: This was really seen!
 T To: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
diff --git a/test/rejectlog/0227 b/test/rejectlog/0227
index f24b9c151..0246789dd 100644
--- a/test/rejectlog/0227
+++ b/test/rejectlog/0227
@@ -19,7 +19,8 @@ P Received: from [V4NET.0.0.4] (ident=root)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <uncheckable@localhost1>)
 	id 10HmaX-0005vi-00
-	for z@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for z@remote.domain;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z
 1999-03-02 09:44:33 10HmaY-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <uncheckable@localhost1>
@@ -28,7 +29,8 @@ P Received: from [V4NET.0.0.4] (ident=root)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <uncheckable@localhost1>)
 	id 10HmaY-0005vi-00
-	for z@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for z@remote.domain;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z
 1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index cd6586cdb..5b3680db7 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -3,7 +3,8 @@ Envelope-from: <>
 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
+	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
@@ -12,7 +13,8 @@ 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
+	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
@@ -24,7 +26,8 @@ Envelope-to: <x@y>
 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
+	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
@@ -33,7 +36,8 @@ 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
+	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
diff --git a/test/rejectlog/0451 b/test/rejectlog/0451
index e2616875e..40b70cef1 100644
--- a/test/rejectlog/0451
+++ b/test/rejectlog/0451
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=a.b.c.d)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for good@test.ex;
+	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
@@ -16,7 +17,8 @@ P Received: from CALLER (helo=a.b.c.d)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for good@test.ex;
+	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..2f16fd349 100644
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -3,7 +3,8 @@ Envelope-from: <>
 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
+	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
diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index b2ece3e1f..e78a7a14d 100644
--- a/test/rejectlog/0468
+++ b/test/rejectlog/0468
@@ -4,7 +4,8 @@ Envelope-to: <x@y>
 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
+	for x@y;
+	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
@@ -14,7 +15,8 @@ Envelope-to: <x@y>
 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
+	for x@y;
+	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/0482 b/test/rejectlog/0482
index 9bbdd8691..e29be3469 100644
--- a/test/rejectlog/0482
+++ b/test/rejectlog/0482
@@ -7,5 +7,6 @@ P Received: from [127.0.0.1] (helo=foobar)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From                                                                                                                                                                                                                              : userx
diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index ef53406f4..5ae8529d8 100644
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -4,7 +4,8 @@ Envelope-to: <aa@test.ex>
 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
+	for aa@test.ex;
+	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 41fd97e5b..b6ec7ace5 100644
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -4,7 +4,8 @@ Envelope-to: <userx@x.y>
 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
+	for userx@x.y;
+	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
@@ -15,7 +16,8 @@ Envelope-to: <userx@myhost.test.ex>
 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
+	for userx@myhost.test.ex;
+	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/0507 b/test/rejectlog/0507
index ca6243bd3..2f186fd25 100644
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -4,7 +4,8 @@ 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 10HmaX-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -15,7 +16,8 @@ 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 10HmaY-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -27,7 +29,8 @@ Envelope-to: <userx@dom.com>
     <userz@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
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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
diff --git a/test/rejectlog/0536 b/test/rejectlog/0536
index bf06473b6..71c95f7ad 100644
--- a/test/rejectlog/0536
+++ b/test/rejectlog/0536
@@ -22,7 +22,8 @@ Envelope-to: <user1@myhost.test.ex>
 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
+	for user1@myhost.test.ex;
+	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
@@ -32,7 +33,8 @@ Envelope-to: <user1@myhost.test.ex>
 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
+	for user1@myhost.test.ex;
+	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
diff --git a/test/rejectlog/0539 b/test/rejectlog/0539
index 74da8e6e1..a9bff02b4 100644
--- a/test/rejectlog/0539
+++ b/test/rejectlog/0539
@@ -8,7 +8,8 @@ Envelope-to: <userx@test.ex>
 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
+	for userx@test.ex;
+	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/0562 b/test/rejectlog/0562
index e40415254..555ccc9a7 100644
--- a/test/rejectlog/0562
+++ b/test/rejectlog/0562
@@ -10,4 +10,5 @@ P Received: from [127.0.0.1] (helo=abcd)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0571 b/test/rejectlog/0571
index 435668e9b..6f6a39750 100644
--- a/test/rejectlog/0571
+++ b/test/rejectlog/0571
@@ -4,7 +4,8 @@ Envelope-to: <ok1@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ted@29.29.0.com>)
 	id 10HmaX-0005vi-00
-	for ok1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for ok1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: ted@29.29.0.com
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0585 b/test/rejectlog/0585
index 993bc4559..ef368aff7 100644
--- a/test/rejectlog/0585
+++ b/test/rejectlog/0585
@@ -4,7 +4,8 @@ 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 10HmaX-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: b@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -15,7 +16,8 @@ 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 10HmaY-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: c@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -27,7 +29,8 @@ Envelope-to: <userx@dom.com>
     <userz@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
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: e@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
diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index e60a0edd5..36ff19360 100644
--- a/test/rejectlog/2037
+++ b/test/rejectlog/2037
@@ -9,11 +9,13 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	id 10HmaX-0005vi-00
-	for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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 data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: test
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index e60a0edd5..36ff19360 100644
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -9,11 +9,13 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	id 10HmaX-0005vi-00
-	for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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 data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: test
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/rejectlog/2500 b/test/rejectlog/2500
index 8c09f1568..d985da2e5 100644
--- a/test/rejectlog/2500
+++ b/test/rejectlog/2500
@@ -4,7 +4,8 @@ Envelope-to: <tainted@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for tainted@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for tainted@test.ex;
+	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
@@ -13,7 +14,8 @@ Envelope-from: <>
 Envelope-to: <CALLER@myhost.test.ex>
 P 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
diff --git a/test/rejectlog/4000 b/test/rejectlog/4000
index d401a5e78..e854db0f3 100644
--- a/test/rejectlog/4000
+++ b/test/rejectlog/4000
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: J Caesar <jcaesar@test.ex>
 T To: a-list00@exim.org
diff --git a/test/rejectlog/4006 b/test/rejectlog/4006
index f9626e35a..cd090eae4 100644
--- a/test/rejectlog/4006
+++ b/test/rejectlog/4006
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one due to scanner error
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4007 b/test/rejectlog/4007
index f46e9e71e..2eb5c383c 100644
--- a/test/rejectlog/4007
+++ b/test/rejectlog/4007
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one, the scanner had an error
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one, the scanner had an error
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4008 b/test/rejectlog/4008
index 2c4463ad0..78227194a 100644
--- a/test/rejectlog/4008
+++ b/test/rejectlog/4008
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4009 b/test/rejectlog/4009
index 5aad09639..5709bc3d6 100644
--- a/test/rejectlog/4009
+++ b/test/rejectlog/4009
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4010 b/test/rejectlog/4010
index fbe3b69f0..ecc080411 100644
--- a/test/rejectlog/4010
+++ b/test/rejectlog/4010
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected as the options are not relevant
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4011 b/test/rejectlog/4011
index 16c708986..15a85944a 100644
--- a/test/rejectlog/4011
+++ b/test/rejectlog/4011
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one (daemon tmp-err)
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected (virus found)
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected (virus found)
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4012 b/test/rejectlog/4012
index 8ec883c54..1498e324d 100644
--- a/test/rejectlog/4012
+++ b/test/rejectlog/4012
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4013 b/test/rejectlog/4013
index adeded6fb..5960c5d71 100644
--- a/test/rejectlog/4013
+++ b/test/rejectlog/4013
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4014 b/test/rejectlog/4014
index bd26ac2a4..02d29d2c8 100644
--- a/test/rejectlog/4014
+++ b/test/rejectlog/4014
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4017 b/test/rejectlog/4017
index 670b9057b..a5e565ac3 100644
--- a/test/rejectlog/4017
+++ b/test/rejectlog/4017
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one, the scanner had an error
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4506 b/test/rejectlog/4506
index 2d843ee52..95df33e74 100644
--- a/test/rejectlog/4506
+++ b/test/rejectlog/4506
@@ -7,7 +7,8 @@ P Received: from [127.0.0.1] (helo=xxx)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <shouldfail@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=test.ex; h=from:to
 	:date:message-id:subject; s=sel; bh=OB9dZVu7+5/ufs3TH9leIcEpXSo=;
 F From: mrgus@text.ex
diff --git a/test/rejectlog/5500 b/test/rejectlog/5500
index 6b2ce923e..21b11203a 100644
--- a/test/rejectlog/5500
+++ b/test/rejectlog/5500
@@ -6,5 +6,6 @@ Envelope-to: <userp@test.ex>
     <userq@test.ex>
 P Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 S Sender: sender@some.where
diff --git a/test/scripts/0000-Basic/0904 b/test/scripts/0000-Basic/0904
index 9f09a84ef..270a1167c 100644
--- a/test/scripts/0000-Basic/0904
+++ b/test/scripts/0000-Basic/0904
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK
 QUIT
 225 OK
@@ -41,8 +41,8 @@ MAIL FROM
 250 good mail cmd
 RCPT TO
 250 acceptable rcpt cmd
-BDAT 329 LAST
-*data 330
+BDAT 331 LAST
+*data 332
 250 OK got that data
 QUIT
 225 OK quitting
@@ -71,8 +71,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 328
+BDAT 331 LAST
+*data 330
 250 OK
 QUIT
 225 OK
@@ -99,8 +99,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 500 oops
 QUIT
 225 OK
@@ -127,8 +127,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 400 not right now
 QUIT
 225 OK
@@ -184,8 +184,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -219,8 +219,8 @@ QUIT
 #250 CHUNKING
 #MAIL FROM
 #RCPT TO
-#BDAT 329 LAST
-#*data 330
+#BDAT 331 LAST
+#*data 332
 #250 good mail cmd
 #****
 #sudo exim -odf -bS
@@ -246,8 +246,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 328
+BDAT 331 LAST
+*data 330
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -277,8 +277,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -306,8 +306,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 330 LAST
-*data 330
+BDAT 332 LAST
+*data 332
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -335,8 +335,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -364,8 +364,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -393,8 +393,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/scripts/0000-Basic/0905 b/test/scripts/0000-Basic/0905
index dcad5441d..5ec145e1a 100644
--- a/test/scripts/0000-Basic/0905
+++ b/test/scripts/0000-Basic/0905
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -134,8 +134,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -255,10 +255,10 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
-*data 295
+*data 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -380,8 +380,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat (nonlast) ungood lacking mail-from
@@ -498,8 +498,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 550 no such recipient
 500 oops nonlast bdat - no rcpt
@@ -617,8 +617,8 @@ EHLO
 MAIL FROM
 RCPT TO
 RCPT TO
-BDAT 279
-*data 279
+BDAT 281
+*data 281
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -740,8 +740,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -858,8 +858,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -979,8 +979,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 400 oops nonlast bdat
@@ -1103,8 +1103,8 @@ BDAT 8191
 250 OK rcpt
 *data 8191
 250 OK nonlast bdat
-BDAT 807 LAST
-*data 807
+BDAT 809 LAST
+*data 809
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/scripts/0000-Basic/0911 b/test/scripts/0000-Basic/0911
index c6979899b..39b7f0092 100644
--- a/test/scripts/0000-Basic/0911
+++ b/test/scripts/0000-Basic/0911
@@ -11,10 +11,10 @@ EHLO
 250 OK
 MAIL FROM
 RCPT TO
-BDAT 313 LAST
+BDAT 315 LAST
 250 OK mail
 250 OK rcpt
-*data 313
+*data 315
 QUIT
 250 OK chunked message data
 221 Closing connection
@@ -39,8 +39,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 315 LAST
-*data 315
+BDAT 317 LAST
+*data 317
 250 OK chunked message data
 QUIT
 221 Closing connection
@@ -68,8 +68,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 321 LAST
+*data 321
 QUIT
 451 Service not available
 221 Closing connection
@@ -98,8 +98,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 321 LAST
+*data 321
 QUIT
 550 content rejected
 221 Closing connection
@@ -126,8 +126,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 317 LAST
-*data 317
+BDAT 319 LAST
+*data 319
 >*eof
 ****
 sudo exim -d-all+transport -odi -bs
diff --git a/test/scripts/4000-scanning/4003 b/test/scripts/4000-scanning/4003
index d9849c341..1f4917d9b 100644
--- a/test/scripts/4000-scanning/4003
+++ b/test/scripts/4000-scanning/4003
@@ -20,6 +20,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -80,6 +81,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -138,6 +140,7 @@ server -i 2 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -197,6 +200,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
diff --git a/test/scripts/4000-scanning/4004 b/test/scripts/4000-scanning/4004
index e5a7c9492..72e77a058 100644
--- a/test/scripts/4000-scanning/4004
+++ b/test/scripts/4000-scanning/4004
@@ -22,6 +22,7 @@ server 11333
 <	(envelope
 <	id
 <	for
+<	
 <From:
 <Content-type: text/plain
 <Message-Id:
diff --git a/test/scripts/4006_scan_clamd/4006 b/test/scripts/4006_scan_clamd/4006
index 91d08bd68..db5039f7c 100644
--- a/test/scripts/4006_scan_clamd/4006
+++ b/test/scripts/4006_scan_clamd/4006
@@ -148,6 +148,7 @@ server PORT_D
 <\x09(envelope-from <
 <\x09id
 <\x09for userx@test.ex;
+<\x09
 <Date:
 <Subject: message should be accepted
 <Message-Id: <
diff --git a/test/scripts/4015-scan-ipv6/4015 b/test/scripts/4015-scan-ipv6/4015
index 9e4a857be..b3412123a 100644
--- a/test/scripts/4015-scan-ipv6/4015
+++ b/test/scripts/4015-scan-ipv6/4015
@@ -15,6 +15,7 @@ server 7833
 <	(envelope
 <	id
 <	for
+<	
 <Content-type: text/plain
 <Message-Id:
 <From:
diff --git a/test/scripts/5500-PRDR/5591 b/test/scripts/5500-PRDR/5591
index cf2af61b7..1ab748890 100644
--- a/test/scripts/5500-PRDR/5591
+++ b/test/scripts/5500-PRDR/5591
@@ -16,8 +16,8 @@ RCPT TO
 250 OK
 RCPT TO
 250 OK
-BDAT 285 LAST
-*data 285
+BDAT 287 LAST
+*data 287
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good
diff --git a/test/scripts/5800-DANE/5800 b/test/scripts/5800-DANE/5800
index 98a70c115..7b74fc1b7 100644
--- a/test/scripts/5800-DANE/5800
+++ b/test/scripts/5800-DANE/5800
@@ -1,4 +1,4 @@
-# Expansion test for DANE.
+# Expansion test for DANE
 #
 # Some systems seem to use 1-byte fields for the leading
 # 3 fields in a TLSA record, others 2-bytes.
diff --git a/test/stderr/0022 b/test/stderr/0022
index 510c5499a..dc0e12575 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -51,7 +51,8 @@ P Received: from [V4NET.9.8.7]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbF-0005vi-00
-	for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for warn_empty@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=[V4NET.9.8.7] P=smtp S=sss
 SMTP>> 250 OK id=10HmbF-0005vi-00
@@ -118,7 +119,8 @@ P Received: from [V4NET.9.8.7]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbG-0005vi-00
-	for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for warn_log@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=[V4NET.9.8.7] P=smtp S=sss
 SMTP>> 250 OK id=10HmbG-0005vi-00
@@ -183,7 +185,8 @@ P Received: from [V4NET.9.8.7]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbH-0005vi-00
-	for warn_user@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for warn_user@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: warn user message
 >>
diff --git a/test/stderr/0044 b/test/stderr/0044
index 5c6e9a99f..399c66c4f 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -132,7 +132,8 @@ P Received: from [V4NET.11.12.13] (helo=exim.test.ex)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
diff --git a/test/stderr/0264 b/test/stderr/0264
index f572148f1..4f0c65ba7 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -21,7 +21,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   rz.b@outside 
diff --git a/test/stderr/0275 b/test/stderr/0275
index 4e27129b2..5a1188c40 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -133,7 +133,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -163,7 +164,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0278 b/test/stderr/0278
index 4ea1cf371..727a6b885 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -92,7 +92,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex 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
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -122,7 +123,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   CALLER@test.ex 
diff --git a/test/stderr/0294 b/test/stderr/0294
index cd0424eb8..c2ffd2d96 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -40,7 +40,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -71,7 +72,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for two@z; Tue, 2 Mar 1999 09:44:33 +0000
+	for two@z;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0303 b/test/stderr/0303
index 5af9bac7f..72ff9e1d1 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -99,7 +99,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from [V4NET.2.3.4]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
@@ -172,7 +173,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from host.name.tld ([V4NET.2.3.4])
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00
diff --git a/test/stderr/0317 b/test/stderr/0317
index 71d883ddd..85ee2740a 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -24,7 +24,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -64,7 +65,8 @@ Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P 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
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0361 b/test/stderr/0361
index 1eb948586..e77090a21 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -39,7 +39,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for kilos@recurse.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -68,7 +69,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   kilos@recurse.test.ex 
diff --git a/test/stderr/0371 b/test/stderr/0371
index d24df68e7..d01822978 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -85,7 +85,8 @@ P Received: from [V4NET.0.0.0] (helo=something)
 	by mail.test.ex with esmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "data"
 processing "accept" (TESTSUITE/test-config 37)
 check set acl_m0 = $acl_m0; data
diff --git a/test/stderr/0386 b/test/stderr/0386
index f625344eb..545cf35b0 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -226,7 +226,8 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+	for 2@b;
+	Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
@@ -264,7 +265,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   2@b 
@@ -416,7 +417,8 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+	for 2@b;
+	Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
@@ -454,7 +456,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   2@b 
diff --git a/test/stderr/0388 b/test/stderr/0388
index 939aba184..95484cca2 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -219,7 +219,8 @@ Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0402 b/test/stderr/0402
index 865bf34be..3b47d10a6 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -151,7 +151,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
  â•­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -197,7 +198,7 @@ recipients_count=5
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=6
+body_linecount=0 message_linecount=7
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
diff --git a/test/stderr/0403 b/test/stderr/0403
index 939c7f422..e57c974c1 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0404 b/test/stderr/0404
index cf57c90ba..d27d1c5d3 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -131,7 +131,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -163,7 +164,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=159
+body_linecount=0 message_linecount=160
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
@@ -291,7 +292,8 @@ Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
@@ -1536,7 +1538,7 @@ recipients_count=608
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=9
+body_linecount=1 message_linecount=10
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
diff --git a/test/stderr/0408 b/test/stderr/0408
index 1b55f031e..02a6cfea1 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0465 b/test/stderr/0465
index 3f4af9827..bef0e0290 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -77,7 +77,8 @@ Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for abc@domain;
+	Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
 processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax
@@ -144,7 +145,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 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
+	for abc@xyz;
+	Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
 processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax
diff --git a/test/stderr/0471 b/test/stderr/0471
index ba94bd78b..76b9b4a56 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -25709,7 +25709,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for r1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <r1@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -25866,7 +25867,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for r2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for r2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <r2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -26022,7 +26024,8 @@ Data file written for message 10HmaZ-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for r3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for r3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 DSN: **** SPOOL_OUT - address: <r3@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
diff --git a/test/stderr/0487 b/test/stderr/0487
index 277fba63b..e59361672 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -57,7 +57,8 @@ P Received: from CALLER (helo=x.y)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -90,7 +91,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=8
+body_linecount=1 message_linecount=9
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0489 b/test/stderr/0489
index 9a00fed12..ef3c01ca7 100644
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -22,7 +22,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -54,7 +55,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
@@ -85,7 +87,8 @@ Data file written for message 10HmaZ-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
 Size of headers = sss
@@ -116,7 +119,8 @@ Data file written for message 10HmbA-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
 Size of headers = sss
@@ -147,7 +151,8 @@ Data file written for message 10HmbB-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H
 Size of headers = sss
@@ -178,7 +183,8 @@ Data file written for message 10HmbC-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H
 Size of headers = sss
@@ -209,7 +215,8 @@ Data file written for message 10HmbD-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H
 Size of headers = sss
@@ -240,7 +247,8 @@ Data file written for message 10HmbE-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0575 b/test/stderr/0575
index 7e6ac1c3e..845b2c362 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -46,7 +46,8 @@ P Received: from [V4NET.0.0.0]
 	by mail.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=[V4NET.0.0.0] P=smtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
diff --git a/test/stderr/0911 b/test/stderr/0911
index 6a6645ded..9ea7f1f25 100644
--- a/test/stderr/0911
+++ b/test/stderr/0911
@@ -40,7 +40,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 313 LAST
+  SMTP+> BDAT 315 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
@@ -104,7 +104,7 @@ cmd buf flush ddd bytes
 sync_responses expect rcpt for nopipe@test.ex
   SMTP<< 250 OK rcpt
          will write message using CHUNKING
-  SMTP+> BDAT 315 LAST
+  SMTP+> BDAT 317 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300
@@ -169,7 +169,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 319 LAST
+  SMTP+> BDAT 321 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
@@ -238,7 +238,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 319 LAST
+  SMTP+> BDAT 321 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
@@ -307,7 +307,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 317 LAST
+  SMTP+> BDAT 319 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
diff --git a/test/stderr/2600 b/test/stderr/2600
index e0463403a..869198a37 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -443,7 +443,8 @@ Data file written for message 10HmaX-0005vi-00
 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@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -473,7 +474,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@myhost.test.ex 
diff --git a/test/stderr/2610 b/test/stderr/2610
index 7a430b6c9..73812a2c7 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -441,7 +441,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for ph10@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <ph10@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -471,7 +472,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   ph10@myhost.test.ex 
diff --git a/test/stderr/2620 b/test/stderr/2620
index 289471282..5a4cbb335 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -498,7 +498,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <CALLER@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -528,7 +529,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   CALLER@myhost.test.ex 
diff --git a/test/stderr/5004 b/test/stderr/5004
index 56ae012a5..1cd68d193 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -34,7 +34,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -66,7 +67,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/5005 b/test/stderr/5005
index c01854665..47852e4fe 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for nofile@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <nofile@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   nofile@test.ex 
@@ -219,7 +220,8 @@ Data file written for message 10HmaY-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -248,7 +250,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
@@ -406,7 +408,8 @@ Data file written for message 10HmaZ-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
@@ -435,7 +438,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
@@ -599,7 +602,8 @@ Data file written for message 10HmbA-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
@@ -628,7 +632,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/5006 b/test/stderr/5006
index 250352ffb..21959bb66 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P 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
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stdout/0015 b/test/stdout/0015
index d82e3cbc9..1949f3865 100644
--- a/test/stdout/0015
+++ b/test/stdout/0015
@@ -14,7 +14,8 @@ DATA
 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
+	for S+userx@Test.Ex;
+	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
@@ -39,7 +40,8 @@ DATA
 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
+	for Userx-S@Test.Ex;
+	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
diff --git a/test/stdout/0033 b/test/stdout/0033
index 82aa1e93e..0ad42d527 100644
--- a/test/stdout/0033
+++ b/test/stdout/0033
@@ -18,7 +18,8 @@ DATA
 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
+	for list@test.ex;
+	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
@@ -46,7 +47,8 @@ DATA
 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
+	for list@test.ex;
+	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
diff --git a/test/stdout/0035 b/test/stdout/0035
index 94b08fcd6..2a2bc285c 100644
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -161,7 +161,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <notsubmit@y>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 10HmaY-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
@@ -183,7 +184,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <a@y>)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	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
@@ -207,7 +209,8 @@ x@y
 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
+	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
 10HmbA-0005vi-00-H
@@ -231,7 +234,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <notsubmit@y>)
 	id 10HmbA-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 dddS Sender: sender@some.where
 10HmbB-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
@@ -254,7 +258,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <a@y>)
 	id 10HmbB-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ddd* Sender: sender@some.where
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 dddF From: a@y
@@ -280,7 +285,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <a@y>)
 	id 10HmbC-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 dddS Sender: sender@some.where
 047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 dddF From: a@y
@@ -306,7 +312,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <a@y>)
 	id 10HmbD-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ddd* Sender: sender@some.where
 047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 dddF From: SomeName <a@y>
diff --git a/test/stdout/0100 b/test/stdout/0100
index f4c25d7e5..8eb236715 100644
--- a/test/stdout/0100
+++ b/test/stdout/0100
@@ -14,7 +14,8 @@ DATA
 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
+	for userx@domain.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ..dotheader: This is perfectly legal
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
@@ -45,7 +46,8 @@ X-Filtered: just checking
 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
+	for userx@filtered.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ..dotheader: This is perfectly legal
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/stdout/0101 b/test/stdout/0101
index c5e6a37c3..7fef0f808 100644
--- a/test/stdout/0101
+++ b/test/stdout/0101
@@ -14,7 +14,8 @@ DATA
 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
+	for userx@domain.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ..dotheader: This is perfectly legal
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/stdout/0143 b/test/stdout/0143
index 1075fed7f..91e464eb6 100644
--- a/test/stdout/0143
+++ b/test/stdout/0143
@@ -16,7 +16,8 @@ DATA
 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
+	for userx@domain.com;
+	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/stdout/0163 b/test/stdout/0163
index 8e8832381..fbbc60192 100644
--- a/test/stdout/0163
+++ b/test/stdout/0163
@@ -15,7 +15,8 @@ DATA
 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
+	for userx@domain.com;
+	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/stdout/0177 b/test/stdout/0177
index f558f08d2..df53dd2af 100644
--- a/test/stdout/0177
+++ b/test/stdout/0177
@@ -22,7 +22,8 @@ DATA
 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
+	for userz@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this (3)
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/stdout/0179 b/test/stdout/0179
index c8db94620..79524d8fe 100644
--- a/test/stdout/0179
+++ b/test/stdout/0179
@@ -15,7 +15,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -31,7 +32,8 @@ DATA
 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
+	for abcd@domain.com;
+	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
diff --git a/test/stdout/0185 b/test/stdout/0185
index dba278f72..f0dc3d3b9 100644
--- a/test/stdout/0185
+++ b/test/stdout/0185
@@ -18,7 +18,8 @@ DATA
 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
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/stdout/0190 b/test/stdout/0190
index 756f7f851..1a5c1c22b 100644
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -125,7 +125,8 @@ DATA
 350 Send message
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -150,7 +151,8 @@ DATA
 350 Send message
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -175,7 +177,8 @@ DATA
 350 Send message
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -202,7 +205,8 @@ DATA
 350 Send message
 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
+	id 10HmaY-0005vi-00;
+	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
@@ -227,7 +231,8 @@ DATA
 350 Send message
 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
+	id 10HmaY-0005vi-00;
+	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
@@ -256,7 +261,8 @@ DATA
 350 Send message
 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
+	id 10HmaZ-0005vi-00;
+	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/stdout/0203 b/test/stdout/0203
index b311e114c..2a4048e1a 100644
--- a/test/stdout/0203
+++ b/test/stdout/0203
@@ -15,7 +15,8 @@ DATA
 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
+	for userx@domain1;
+	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/stdout/0209 b/test/stdout/0209
index 90a59b259..ebb3e5ae7 100644
--- a/test/stdout/0209
+++ b/test/stdout/0209
@@ -31,7 +31,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaZ-0005vi-00;
+	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/stdout/0210 b/test/stdout/0210
index 2eedebd91..30ad65754 100644
--- a/test/stdout/0210
+++ b/test/stdout/0210
@@ -13,7 +13,8 @@ RCPT TO:<smtp@test.ex>
 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
+	id 10HmaX-0005vi-00;
+	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/stdout/0215 b/test/stdout/0215
index d6d06cfe6..a883c1c02 100644
--- a/test/stdout/0215
+++ b/test/stdout/0215
@@ -17,7 +17,8 @@ DATA
 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
+	for userx@myhost.test.ex;
+	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
@@ -52,7 +53,8 @@ DATA
 354 Send it
 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
+	id 10HmaY-0005vi-00;
+	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
@@ -92,7 +94,8 @@ DATA
 354 Send it
 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
+	id 10HmbA-0005vi-00;
+	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
@@ -139,7 +142,8 @@ DATA
 354 Send it
 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
+	id 10HmbC-0005vi-00;
+	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
@@ -172,7 +176,8 @@ DATA
 354 Send it
 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
+	id 10HmbE-0005vi-00;
+	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
@@ -204,7 +209,8 @@ DATA
 354 Send it
 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
+	id 10HmbF-0005vi-00;
+	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/stdout/0217 b/test/stdout/0217
index 17ed51ba8..ab2b72ac9 100644
--- a/test/stdout/0217
+++ b/test/stdout/0217
@@ -20,7 +20,8 @@ DATA
 351 Send more
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -607,7 +608,8 @@ DATA
 351 Send more
 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
+	id 10HmbP-0005vi-00;
+	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
@@ -829,7 +831,8 @@ DATA
 354 go
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbQ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbQ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -944,7 +947,8 @@ DATA
 354 go
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbQ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbQ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -959,7 +963,8 @@ DATA
 354 go
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmbQ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbQ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0218 b/test/stdout/0218
index c7f853fc5..f4680eda7 100644
--- a/test/stdout/0218
+++ b/test/stdout/0218
@@ -15,7 +15,8 @@ DATA
 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
+	for a@test.ex;
+	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
@@ -32,7 +33,8 @@ DATA
 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
+	for b@test.ex;
+	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
@@ -81,7 +83,8 @@ DATA
 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
+	for c@test.ex;
+	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
diff --git a/test/stdout/0231 b/test/stdout/0231
index f74359cac..5f889752c 100644
--- a/test/stdout/0231
+++ b/test/stdout/0231
@@ -19,7 +19,8 @@ DATA
 354 OK
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 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,
diff --git a/test/stdout/0242 b/test/stdout/0242
index 7dc9a2e1b..753889433 100644
--- a/test/stdout/0242
+++ b/test/stdout/0242
@@ -14,7 +14,8 @@ DATA
 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
+	for abc@x.y.z;
+	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
@@ -39,7 +40,8 @@ DATA
 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
+	for abc@x.y.z;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test message
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/stdout/0245 b/test/stdout/0245
index da28e7e94..f3b1a3948 100644
--- a/test/stdout/0245
+++ b/test/stdout/0245
@@ -27,7 +27,8 @@ 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 036T To: <"abc
    def"@test.ex>, xxx@yyy
 ddd* Bcc: aaa@bbb    
diff --git a/test/stdout/0250 b/test/stdout/0250
index d4d723725..c4332818e 100644
--- a/test/stdout/0250
+++ b/test/stdout/0250
@@ -21,7 +21,8 @@ SomeOne-rewritten@test.ex
 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
+	for SomeOne-rewritten@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ddd* From: userx@test.ex
 dddF From: userx-rewritten@test.ex
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -53,7 +54,8 @@ OtherOne-rewritten@test.ex
 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
+	for OtherOne-rewritten@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ddd* From: usery@test.ex
 dddF From: usery-rewritten@test.ex
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -85,7 +87,8 @@ ThirdOne-rewritten@test.ex
 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
+	for ThirdOne-rewritten@test.ex;
+	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>
diff --git a/test/stdout/0253 b/test/stdout/0253
index e289e817f..b0544c8d8 100644
--- a/test/stdout/0253
+++ b/test/stdout/0253
@@ -15,7 +15,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -41,7 +42,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaZ-0005vi-00;
+	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
diff --git a/test/stdout/0254 b/test/stdout/0254
index 1fcd3fd45..3897ce385 100644
--- a/test/stdout/0254
+++ b/test/stdout/0254
@@ -21,7 +21,8 @@ userx@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
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	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
@@ -59,7 +60,8 @@ userx@myhost.test.ex
 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
+	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
@@ -90,7 +92,8 @@ userx@myhost.test.ex
 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
+	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
diff --git a/test/stdout/0285 b/test/stdout/0285
index 37a681a08..256a65070 100644
--- a/test/stdout/0285
+++ b/test/stdout/0285
@@ -16,7 +16,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -41,7 +42,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -67,7 +69,8 @@ DATA
 354 Send 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -92,7 +95,8 @@ DATA
 354 Send 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -118,7 +122,8 @@ DATA
 354 Send 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
+	id 10HmaZ-0005vi-00;
+	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/stdout/0286 b/test/stdout/0286
index e0a34b348..ea7e87ed9 100644
--- a/test/stdout/0286
+++ b/test/stdout/0286
@@ -16,7 +16,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -46,7 +47,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -61,7 +63,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -95,7 +98,8 @@ DATA
 354 Send 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -129,7 +133,8 @@ DATA
 354 Send 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
+	id 10HmaZ-0005vi-00;
+	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/stdout/0288 b/test/stdout/0288
index 3eab9dfe7..d7a6e1800 100644
--- a/test/stdout/0288
+++ b/test/stdout/0288
@@ -15,7 +15,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -39,7 +40,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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/stdout/0299 b/test/stdout/0299
index 798f402e6..20d32d789 100644
--- a/test/stdout/0299
+++ b/test/stdout/0299
@@ -16,7 +16,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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
@@ -31,7 +32,8 @@ DATA
 354 Send 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
+	id 10HmaX-0005vi-00;
+	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/stdout/0311 b/test/stdout/0311
index a26b24c55..b77eaf013 100644
--- a/test/stdout/0311
+++ b/test/stdout/0311
@@ -21,7 +21,8 @@ xx@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
-	for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for xx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 ddd* return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q
@@ -51,7 +52,8 @@ xx@myhost.test.ex
 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
+	for xx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 017  return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q
diff --git a/test/stdout/0332 b/test/stdout/0332
index d1593fa4e..648b56e09 100644
--- a/test/stdout/0332
+++ b/test/stdout/0332
@@ -16,7 +16,8 @@ DATA
 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
+	for ok@no.delay;
+	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
@@ -32,7 +33,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaY-0005vi-00;
+	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/stdout/0333 b/test/stdout/0333
index d1593fa4e..648b56e09 100644
--- a/test/stdout/0333
+++ b/test/stdout/0333
@@ -16,7 +16,8 @@ DATA
 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
+	for ok@no.delay;
+	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
@@ -32,7 +33,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaY-0005vi-00;
+	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/stdout/0338 b/test/stdout/0338
index 06aab63cf..7be32298c 100644
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -26,7 +26,8 @@ a1-userx@test.ex  0,0 postmaster@test.ex 18,0#3
 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
+	for userx@test.ex;
+	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..d7fefbfc1 100644
--- a/test/stdout/0363
+++ b/test/stdout/0363
@@ -14,7 +14,8 @@ DATA
 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
+	for Aa%Bb@Cc;
+	Tue, 2 Mar 1999 09:44:33 +0000
 To: aa%bb@cc
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
diff --git a/test/stdout/0367 b/test/stdout/0367
index b54aff8ff..3a592d2cb 100644
--- a/test/stdout/0367
+++ b/test/stdout/0367
@@ -15,7 +15,8 @@ DATA
 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
+	for userx@domain1;
+	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
@@ -32,7 +33,8 @@ DATA
 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
+	for userx@domain1;
+	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
@@ -49,7 +51,8 @@ DATA
 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
+	for userx@domain1;
+	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
@@ -66,7 +69,8 @@ DATA
 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
+	for userx@domain1;
+	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
diff --git a/test/stdout/0374 b/test/stdout/0374
index f9844eb3b..16089d23e 100644
--- a/test/stdout/0374
+++ b/test/stdout/0374
@@ -13,7 +13,8 @@ DATA
 334 send more
 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
+	id 10HmaX-0005vi-00;
+	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/stdout/0375 b/test/stdout/0375
index 6e0080d5b..c8139f879 100644
--- a/test/stdout/0375
+++ b/test/stdout/0375
@@ -13,7 +13,8 @@ DATA
 334 send more
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -72,7 +73,8 @@ DATA
 334 send more
 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
+	id 10HmaX-0005vi-00;
+	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/stdout/0377 b/test/stdout/0377
index f6d8fc6f6..e09e54925 100644
--- a/test/stdout/0377
+++ b/test/stdout/0377
@@ -23,7 +23,8 @@ 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
+	id 10HmaX-0005vi-00;
+	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 e163ed170..0f2367a24 100644
--- a/test/stdout/0378
+++ b/test/stdout/0378
@@ -22,7 +22,8 @@ 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
-	for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for aaaa@myhost.test.ex;
+	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 d3bd25e7b..7321f4e12 100644
--- a/test/stdout/0379
+++ b/test/stdout/0379
@@ -22,7 +22,8 @@ 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
+	id 10HmaX-0005vi-00;
+	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 758f2614d..49849423c 100644
--- a/test/stdout/0389
+++ b/test/stdout/0389
@@ -28,7 +28,8 @@ x@y
 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
+	for x@y;
+	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..b21aff290 100644
--- a/test/stdout/0431
+++ b/test/stdout/0431
@@ -15,7 +15,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -40,7 +41,8 @@ DATA
 354 Go ahead
 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
+	id 10HmaY-0005vi-00;
+	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
diff --git a/test/stdout/0440 b/test/stdout/0440
index 7433e27b4..22057e92d 100644
--- a/test/stdout/0440
+++ b/test/stdout/0440
@@ -14,7 +14,8 @@ DATA
 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
+	for x1@y1;
+	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
@@ -31,7 +32,8 @@ DATA
 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
+	for x3@y3;
+	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
@@ -48,7 +50,8 @@ DATA
 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
+	for x2@y2;
+	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
diff --git a/test/stdout/0461 b/test/stdout/0461
index 16c0f34e6..b610cba0b 100644
--- a/test/stdout/0461
+++ b/test/stdout/0461
@@ -14,7 +14,8 @@ DATA
 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
+	for userx@test.ex;
+	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
@@ -39,7 +40,8 @@ DATA
 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
+	for userx@test.ex;
+	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
@@ -64,7 +66,8 @@ DATA
 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
+	for userx@test.ex;
+	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/stdout/0467 b/test/stdout/0467
index 553dda850..c3891547d 100644
--- a/test/stdout/0467
+++ b/test/stdout/0467
@@ -33,7 +33,8 @@ DATA
 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
+	for x@srv27.test.ex;
+	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/stdout/0474 b/test/stdout/0474
index f00a7d80b..78f2f82e0 100644
--- a/test/stdout/0474
+++ b/test/stdout/0474
@@ -23,7 +23,8 @@ 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
-	for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+	for abcd@xyz;
+	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
diff --git a/test/stdout/0488 b/test/stdout/0488
index 680def49c..6b0b1c603 100644
--- a/test/stdout/0488
+++ b/test/stdout/0488
@@ -26,7 +26,8 @@ userx@test.ex
 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
+	for userx@test.ex;
+	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/0490 b/test/stdout/0490
index cc71d26e1..fb456ca52 100644
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -30,7 +30,8 @@ bb@test.ex
 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
+	for bb@test.ex;
+	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 5c48151b0..d445ac032 100644
--- a/test/stdout/0495
+++ b/test/stdout/0495
@@ -40,7 +40,8 @@ DATA
 354 OK
 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
+	id 10HmaZ-0005vi-00;
+	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
@@ -114,7 +115,8 @@ DATA
 354 OK
 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
+	id 10HmbD-0005vi-00;
+	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
@@ -141,7 +143,8 @@ DATA
 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
+	id 10HmbJ-0005vi-00;
+	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
diff --git a/test/stdout/0497 b/test/stdout/0497
index e179e58a2..0cc6992da 100644
--- a/test/stdout/0497
+++ b/test/stdout/0497
@@ -60,7 +60,8 @@ DATA
 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
+	for userx@x.y;
+	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
@@ -128,7 +129,8 @@ DATA
 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
+	for userx@x.y;
+	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
diff --git a/test/stdout/0498 b/test/stdout/0498
index 61a27bee9..bd4bdf9ea 100644
--- a/test/stdout/0498
+++ b/test/stdout/0498
@@ -29,7 +29,8 @@ DATA
 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
+	for userx@x.y;
+	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/stdout/0514 b/test/stdout/0514
index 913378aef..4e85fa66a 100644
--- a/test/stdout/0514
+++ b/test/stdout/0514
@@ -24,7 +24,8 @@ userx@myhost.test.ex
 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
+	for userx@myhost.test.ex;
+	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 9691d20bc..e4d0d9c2b 100644
--- a/test/stdout/0531
+++ b/test/stdout/0531
@@ -16,7 +16,8 @@ DATA
 354 Send it
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -43,7 +44,8 @@ DATA
 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
+	for userx@retry.test.ex;
+	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
@@ -69,7 +71,8 @@ DATA
 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
+	for userx@retry.test.ex;
+	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/stdout/0543 b/test/stdout/0543
index 6b6a6067f..6c82e87d5 100644
--- a/test/stdout/0543
+++ b/test/stdout/0543
@@ -30,7 +30,8 @@ DATA
 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
+	for userx@domain1;
+	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/stdout/0554 b/test/stdout/0554
index cb3717195..540a50681 100644
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -30,7 +30,8 @@ DATA
 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
+	for x@y;
+	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/stdout/0560 b/test/stdout/0560
index 45a84cf13..2423d1618 100644
--- a/test/stdout/0560
+++ b/test/stdout/0560
@@ -1,7 +1,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: Somebody <abcd@x.y.z>
 To: first@test.ex
     another@another.ex
diff --git a/test/stdout/0565 b/test/stdout/0565
index be4e45594..5433ba49d 100644
--- a/test/stdout/0565
+++ b/test/stdout/0565
@@ -27,7 +27,8 @@ DATA
 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
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: postmaster@y
 To: x@y
 Subject: first test message
@@ -56,7 +57,8 @@ DATA
 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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 From: postmaster@y
 To: x@y
 Subject: second test message
diff --git a/test/stdout/0580 b/test/stdout/0580
index 7dbc7d2cf..5d3d0bd04 100644
--- a/test/stdout/0580
+++ b/test/stdout/0580
@@ -48,7 +48,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -87,7 +88,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -126,7 +128,8 @@ DATA
 354 hit me
 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
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -153,7 +156,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -178,7 +182,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/stdout/0616 b/test/stdout/0616
index 369cf7f39..2cc574f49 100644
--- a/test/stdout/0616
+++ b/test/stdout/0616
@@ -17,7 +17,8 @@ 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
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	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
diff --git a/test/stdout/0617 b/test/stdout/0617
index 369cf7f39..2cc574f49 100644
--- a/test/stdout/0617
+++ b/test/stdout/0617
@@ -17,7 +17,8 @@ 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
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	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
diff --git a/test/stdout/0623 b/test/stdout/0623
index 1c571c961..4a156de07 100644
--- a/test/stdout/0623
+++ b/test/stdout/0623
@@ -18,7 +18,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for good@test.ex;
+	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
@@ -43,7 +44,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for nopipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for nopipe@test.ex;
+	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
@@ -69,7 +71,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for tempreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for tempreject@test.ex;
+	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
@@ -96,7 +99,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for permreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for permreject@test.ex;
+	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
@@ -123,7 +127,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for permreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for permreject@test.ex;
+	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
diff --git a/test/stdout/0904 b/test/stdout/0904
index 6df789115..52f93b9ed 100644
--- a/test/stdout/0904
+++ b/test/stdout/0904
@@ -10,7 +10,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK
 QUIT
 225 OK
@@ -26,7 +26,7 @@ MAIL FROM:<>
 250 good mail cmd
 RCPT TO:<b@test.ex>
 250 acceptable rcpt cmd
-BDAT 329 LAST
+BDAT 331 LAST
 Unexpected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
@@ -38,7 +38,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<c@test.ex>
 250 OK
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK
 
 Comparison failed - bailing out
@@ -53,7 +53,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
-BDAT 329 LAST
+BDAT 331 LAST
 500 oops
 QUIT
 225 OK
@@ -68,7 +68,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<e@test.ex>
 250 OK
-BDAT 329 LAST
+BDAT 331 LAST
 400 not right now
 QUIT
 225 OK
@@ -94,7 +94,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -111,7 +111,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<r@test.ex>
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -127,7 +127,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
-BDAT 329 LAST
+BDAT 331 LAST
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -143,7 +143,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s1@test.ex>
-BDAT 330 LAST
+BDAT 332 LAST
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -159,7 +159,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t@test.ex>
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -175,7 +175,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -191,7 +191,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
-BDAT 329 LAST
+BDAT 331 LAST
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/stdout/0905 b/test/stdout/0905
index 5d4a01198..cb553e1cf 100644
--- a/test/stdout/0905
+++ b/test/stdout/0905
@@ -10,7 +10,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<a@test.ex>
 250 OK
-BDAT 295
+BDAT 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 250 OK bdat
@@ -28,7 +28,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<d@test.ex>
 250 OK
-BDAT 295
+BDAT 297
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -42,7 +42,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<p@test.ex>
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -61,7 +61,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<s@test.ex>
-BDAT 295
+BDAT 297
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat (nonlast) ungood lacking mail-from
@@ -77,7 +77,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<t@test.ex>
-BDAT 295
+BDAT 297
 250 OK mail
 550 no such recipient
 500 oops nonlast bdat - no rcpt
@@ -94,7 +94,7 @@ EHLO testhost.test.ex
 MAIL FROM:<>
 RCPT TO:<t1@test.ex>
 RCPT TO:<t2@test.ex>
-BDAT 279
+BDAT 281
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -113,7 +113,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -129,7 +129,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<v@test.ex>
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -147,7 +147,7 @@ EHLO testhost.test.ex
 250 CHUNKING
 MAIL FROM:<>
 RCPT TO:<u@test.ex>
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
 400 oops nonlast bdat
@@ -167,7 +167,7 @@ BDAT 8191
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
-BDAT 807 LAST
+BDAT 809 LAST
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/stdout/0911 b/test/stdout/0911
index 92db28ba7..b49d16537 100644
--- a/test/stdout/0911
+++ b/test/stdout/0911
@@ -47,7 +47,7 @@ EHLO myhost.test.ex
 250 OK
 MAIL FROM:<>
 RCPT TO:<good@test.ex>
-BDAT 313 LAST
+BDAT 315 LAST
 250 OK mail
 250 OK rcpt
 QUIT
@@ -65,7 +65,7 @@ MAIL FROM:<>
 250 OK mail
 RCPT TO:<nopipe@test.ex>
 250 OK rcpt
-BDAT 315 LAST
+BDAT 317 LAST
 250 OK chunked message data
 QUIT
 221 Closing connection
@@ -82,7 +82,7 @@ MAIL FROM:<>
 250 OK mail
 RCPT TO:<tempreject@test.ex>
 250 OK rcpt
-BDAT 319 LAST
+BDAT 321 LAST
 QUIT
 451 Service not available
 221 Closing connection
@@ -100,7 +100,7 @@ MAIL FROM:<>
 250 OK mail
 RCPT TO:<permreject@test.ex>
 250 OK rcpt
-BDAT 319 LAST
+BDAT 321 LAST
 QUIT
 550 content rejected
 221 Closing connection
@@ -118,6 +118,6 @@ MAIL FROM:<>
 250 OK mail
 RCPT TO:<dataloss@test.ex>
 250 OK rcpt
-BDAT 317 LAST
+BDAT 319 LAST
 >*eof
 End of script
diff --git a/test/stdout/1161 b/test/stdout/1161
index fad916638..ea43216f3 100644
--- a/test/stdout/1161
+++ b/test/stdout/1161
@@ -32,7 +32,8 @@ DATA
 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
+	for x@y;
+	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/stdout/3401 b/test/stdout/3401
index fda6814c5..4de91c262 100644
--- a/test/stdout/3401
+++ b/test/stdout/3401
@@ -22,7 +22,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -50,7 +51,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -78,7 +80,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -140,7 +143,8 @@ DATA
 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
+	for forcesender@domain.com;
+	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
@@ -188,7 +192,8 @@ DATA
 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
+	for userx@domain.com;
+	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
diff --git a/test/stdout/3404 b/test/stdout/3404
index c78436c71..7a5a1c3b0 100644
--- a/test/stdout/3404
+++ b/test/stdout/3404
@@ -18,7 +18,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -47,7 +48,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -80,7 +82,8 @@ DATA
 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
+	for userx@domain.com;
+	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/stdout/3405 b/test/stdout/3405
index 6020e0591..d90cd691c 100644
--- a/test/stdout/3405
+++ b/test/stdout/3405
@@ -18,7 +18,8 @@ DATA
 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
+	for userx@domain.com;
+	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
@@ -48,7 +49,8 @@ DATA
 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
+	for userx@domain.com;
+	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
diff --git a/test/stdout/3412 b/test/stdout/3412
index 80a4e1b38..d6eebaf43 100644
--- a/test/stdout/3412
+++ b/test/stdout/3412
@@ -17,7 +17,8 @@ DATA
 354 Send 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
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: x@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
@@ -56,7 +57,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
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	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/stdout/3415 b/test/stdout/3415
index 7c6e90bdb..0ce6f1909 100644
--- a/test/stdout/3415
+++ b/test/stdout/3415
@@ -175,7 +175,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtpa (Exim x.yz)
 	(envelope-from <username@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	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
@@ -203,7 +204,8 @@ x@y
 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
+	for x@y;
+	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
@@ -230,7 +232,8 @@ x@y
 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
+	for x@y;
+	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
@@ -257,7 +260,8 @@ x@y
 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
+	for x@y;
+	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
@@ -284,7 +288,8 @@ x@y
 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
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 dddF From: abc@x.y.z
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 dddS Sender: username@auth.id.domain
diff --git a/test/stdout/3501 b/test/stdout/3501
index e29d425ff..0ec27c845 100644
--- a/test/stdout/3501
+++ b/test/stdout/3501
@@ -20,7 +20,8 @@ DATA
 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
+	for userx@domain.com;
+	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/stdout/4003 b/test/stdout/4003
index 5c16c636a..f0a931b3b 100644
--- a/test/stdout/4003
+++ b/test/stdout/4003
@@ -57,7 +57,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (Exim x.yz)
 <	(envelope-from <fromuser@myhost.test.ex>)
 <	id 10HmaX-0005vi-00
-<	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 <From: fromuser@myhost.test.ex
@@ -101,7 +102,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (Exim x.yz)
 <	(envelope-from <fromuser@myhost.test.ex>)
 <	id 10HmaY-0005vi-00
-<	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 <From: fromuser@myhost.test.ex
@@ -146,7 +148,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (Exim x.yz)
 <	(envelope-from <fromuser@myhost.test.ex>)
 <	id 10HmaZ-0005vi-00
-<	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 <From: fromuser@myhost.test.ex
@@ -190,7 +193,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (Exim x.yz)
 <	(envelope-from <fromuser@myhost.test.ex>)
 <	id 10HmbA-0005vi-00
-<	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 <From: fromuser@myhost.test.ex
diff --git a/test/stdout/4004 b/test/stdout/4004
index afff4e4df..021f5a354 100644
--- a/test/stdout/4004
+++ b/test/stdout/4004
@@ -29,7 +29,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (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
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <From: MAILER_DAEMON <>
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/stdout/4006 b/test/stdout/4006
index b4a72b826..480b558ff 100644
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -119,7 +119,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (Exim x.yz)
 <	(envelope-from <CALLER@myhost.test.ex>)
 <	id 10HmbD-0005vi-00
-<	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <Date: Tue, 2 Mar 1999 09:44:33 +0000
 <Subject: message should be accepted
 <Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
diff --git a/test/stdout/4015 b/test/stdout/4015
index 7e1d83e89..0e8530164 100644
--- a/test/stdout/4015
+++ b/test/stdout/4015
@@ -15,7 +15,7 @@ Listening on port 7833 ...
 Connection request from [127.0.0.1]
 <REPORT SPAMC/1.2
 <User: nobody
-<Content-length: 465
+<Content-length: 466
 <
 <From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 <X-Envelope-From: <fromuser@myhost.test.ex>
@@ -24,7 +24,8 @@ Connection request from [127.0.0.1]
 <	by myhost.test.ex with local-esmtp (Exim x.yz)
 <	(envelope-from <fromuser@myhost.test.ex>)
 <	id 10HmaX-0005vi-00
-<	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<	for userx@test.ex;
+<	Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 <From: fromuser@myhost.test.ex
diff --git a/test/stdout/4052 b/test/stdout/4052
index 2f2fdc88c..c84be25a5 100644
--- a/test/stdout/4052
+++ b/test/stdout/4052
@@ -19,7 +19,8 @@ Connection request from [127.0.0.1]
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbD-0005vi-00
-	for nocache2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for nocache2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -48,7 +49,8 @@ Connection request from [127.0.0.1]
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbE-0005vi-00
-	for withcache2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for withcache2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -93,7 +95,8 @@ Connection request from [127.0.0.1]
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbG-0005vi-00
-	for nocache3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for nocache3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -122,7 +125,8 @@ Connection request from [127.0.0.1]
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbH-0005vi-00
-	for withcache3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for withcache3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -209,7 +213,8 @@ Connection request from [127.0.0.1]
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbO-0005vi-00
-	for withcache23@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for withcache23@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -239,7 +244,8 @@ Connection request from [127.0.0.1]
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbP-0005vi-00
-	for extchange@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for extchange@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbP-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4711 b/test/stdout/4711
index 78b5203d4..0a5c65dbd 100644
--- a/test/stdout/4711
+++ b/test/stdout/4711
@@ -22,7 +22,8 @@ DATA
 352 go ahead
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -48,7 +49,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -65,7 +67,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -80,7 +83,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -106,7 +110,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -121,7 +126,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -147,7 +153,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -171,7 +178,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4712 b/test/stdout/4712
index 69be8af64..56cd8571c 100644
--- a/test/stdout/4712
+++ b/test/stdout/4712
@@ -14,7 +14,8 @@ DATA
 352 go ahead
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -29,7 +30,8 @@ DATA
 352 go ahead
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -53,7 +55,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -77,7 +80,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4713 b/test/stdout/4713
index 02b10ea77..ac4fc02d4 100644
--- a/test/stdout/4713
+++ b/test/stdout/4713
@@ -16,7 +16,8 @@ DATA
 352 go ahead
 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
+	id 10HmaX-0005vi-00;
+	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
@@ -42,7 +43,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -59,7 +61,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -74,7 +77,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4714 b/test/stdout/4714
index f7d8e221e..207e19a4f 100644
--- a/test/stdout/4714
+++ b/test/stdout/4714
@@ -14,7 +14,8 @@ DATA
 352 go ahead
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 1
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
@@ -30,7 +31,8 @@ DATA
 352 go ahead
 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
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 1
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
@@ -46,7 +48,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 3
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
@@ -62,7 +65,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 3
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
@@ -78,7 +82,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 2
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
@@ -103,7 +108,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: message 2
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
diff --git a/test/stdout/5102 b/test/stdout/5102
index 372019227..76c2ec6a9 100644
--- a/test/stdout/5102
+++ b/test/stdout/5102
@@ -14,7 +14,8 @@ DATA
 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
+	for userx@myhost.test.ex;
+	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
@@ -68,7 +69,8 @@ DATA
 354 Send it
 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
+	id 10HmbA-0005vi-00;
+	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/stdout/5400 b/test/stdout/5400
index 9fae04fb5..1790e18c5 100644
--- a/test/stdout/5400
+++ b/test/stdout/5400
@@ -143,7 +143,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	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
@@ -171,7 +172,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userz@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userz@domain.com;
+	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
@@ -198,7 +200,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	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
@@ -224,7 +227,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 X-hdr-tpt: zzz
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -265,7 +269,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain.com;
+	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
@@ -305,7 +310,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain.com;
+	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
@@ -354,7 +360,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbD-0005vi-00;
+	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
@@ -379,7 +386,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbD-0005vi-00;
+	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
@@ -406,7 +414,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbE-0005vi-00;
+	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
@@ -455,7 +464,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbF-0005vi-00;
+	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
@@ -480,7 +490,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbF-0005vi-00;
+	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
@@ -507,7 +518,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbG-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbG-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -532,7 +544,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbH-0005vi-00
-	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: singledot test
 Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/stdout/5401 b/test/stdout/5401
index c0089f856..52f8d7a48 100644
--- a/test/stdout/5401
+++ b/test/stdout/5401
@@ -49,7 +49,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	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
@@ -111,7 +112,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	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
diff --git a/test/stdout/5402 b/test/stdout/5402
index 1aa55964e..629aa4330 100644
--- a/test/stdout/5402
+++ b/test/stdout/5402
@@ -47,7 +47,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for dest@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for dest@domain.com;
+	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/stdout/5404 b/test/stdout/5404
index aa2bdcaab..fc5058ae7 100644
--- a/test/stdout/5404
+++ b/test/stdout/5404
@@ -27,7 +27,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	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/stdout/5405 b/test/stdout/5405
index ef39477d5..b78f2bce8 100644
--- a/test/stdout/5405
+++ b/test/stdout/5405
@@ -126,7 +126,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for usera@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for usera@domain.com;
+	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
@@ -188,7 +189,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for usere@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for usere@domain.com;
+	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
@@ -214,7 +216,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for userf@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userf@domain.com;
+	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
@@ -240,7 +243,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userg@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userg@domain.com;
+	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
@@ -266,7 +270,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for userj@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userj@domain.com;
+	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
@@ -290,7 +295,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for userh@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userh@domain.com;
+	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
diff --git a/test/stdout/5406 b/test/stdout/5406
index 773c25dd2..e372141ec 100644
--- a/test/stdout/5406
+++ b/test/stdout/5406
@@ -46,7 +46,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	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
@@ -72,7 +73,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for usery@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for usery@domain.com;
+	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
@@ -99,7 +101,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	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
@@ -126,7 +129,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	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/stdout/5407 b/test/stdout/5407
index 90ae013fa..d67b362be 100644
--- a/test/stdout/5407
+++ b/test/stdout/5407
@@ -28,7 +28,8 @@ DATA
 Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	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/stdout/5409 b/test/stdout/5409
index a582bb8c3..e7edb252e 100644
--- a/test/stdout/5409
+++ b/test/stdout/5409
@@ -26,7 +26,8 @@ Received: from CALLER (helo=myhost.test.ex)
 	by myhost.test.ex with local-esmtp (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
+	for userx@domain.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/stdout/5510 b/test/stdout/5510
index b9eb9dbd8..7d2ad816b 100644
--- a/test/stdout/5510
+++ b/test/stdout/5510
@@ -17,7 +17,8 @@ DATA
 300 gimme yer body
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: userx@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -48,7 +49,8 @@ DATA
 300 gimme that body
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: userx@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -76,7 +78,8 @@ DATA
 300 gimme yer body
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: userx@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -106,7 +109,8 @@ RCPT TO:<userq@test.ex>
 DATA
 300 gimme yer body
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbA-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -133,7 +137,8 @@ RCPT TO:<user5.2@test.ex>
 DATA
 300 yeah baby
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbB-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -162,7 +167,8 @@ RCPT TO:<user6.2@test.ex>
 DATA
 300 yeah baby
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbC-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -190,7 +196,8 @@ RCPT TO:<user7.3@test.ex>
 DATA
 300 go ahead
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
-	id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmbD-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -219,7 +226,8 @@ DATA
 300 go ahead
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmbE-0005vi-00
-	for user8.1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for user8.1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
diff --git a/test/stdout/5591 b/test/stdout/5591
index 4794b4a60..6d4524515 100644
--- a/test/stdout/5591
+++ b/test/stdout/5591
@@ -14,7 +14,7 @@ RCPT TO:<usery@testhost.test.ex>
 250 OK
 RCPT TO:<userz@testhost.test.ex>
 250 OK
-BDAT 285 LAST
+BDAT 287 LAST
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good
diff --git a/test/stdout/5700 b/test/stdout/5700
index 6d897d3b7..f1ae127fd 100644
--- a/test/stdout/5700
+++ b/test/stdout/5700
@@ -18,7 +18,8 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmaY-0005vi-00
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -44,7 +45,8 @@ 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
-	for userx@expansionfail; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@expansionfail;
+	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
@@ -102,7 +104,8 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@the.local.host.name>)
 	id 10HmbC-0005vi-00
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5702 b/test/stdout/5702
index de07377f9..09fd602b7 100644
--- a/test/stdout/5702
+++ b/test/stdout/5702
@@ -17,7 +17,8 @@ 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
-	for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@domain1;
+	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