Use separate line in Received: header for timestamp

91 files changed, 477 insertions, 253 deletions

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