Use separate line in Received: header for timestamp

36 files changed, 160 insertions, 80 deletions

diff --git a/test/rejectlog/0021 b/test/rejectlog/0021
index 3dbf53292..daf9ee5c9 100644
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -4,7 +4,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test2>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: ok@test2
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -24,7 +26,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ok@test4>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: ok@test4
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +45,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +56,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <userx@test1>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 3a6ff66a9..96682c4f3 100644
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -4,7 +4,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: @
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: <dummy@gmail.com
   Subject: incomprehensible
 F From: <forged@sender.com
@@ -25,7 +27,8 @@ Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <x@y>, @
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -34,7 +37,8 @@ Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <x@y>
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -45,7 +49,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbB-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: x@y
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -54,7 +59,8 @@ Envelope-from: <>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T to: group name: x@y, p@q;
 R reply-to: group name:;
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index b80e61635..9ae0806fb 100644
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -12,7 +12,8 @@ Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: data1
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -21,7 +22,8 @@ Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: data2
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -30,7 +32,8 @@ Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaZ-0005vi-00
-	for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: data3
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 32a9d0576..1e5600b4f 100644
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -4,7 +4,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0162 b/test/rejectlog/0162
index 515596920..89361d318 100644
--- a/test/rejectlog/0162
+++ b/test/rejectlog/0162
@@ -4,7 +4,8 @@ Envelope-to: <u3@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for u3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for u3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: <u5@compuserve.com>,
   <u6@emory.org>,
   <u7@hotmail.com>,
diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index 5cdd84c43..59443bddb 100644
--- a/test/rejectlog/0214
+++ b/test/rejectlog/0214
@@ -7,7 +7,8 @@ P Received: from [127.0.0.1]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y.x>)
 	id 10HmaX-0005vi-00
-	for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: Me <x@y.z>
   Comment: This was really seen!
 T To: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;
diff --git a/test/rejectlog/0227 b/test/rejectlog/0227
index f24b9c151..0246789dd 100644
--- a/test/rejectlog/0227
+++ b/test/rejectlog/0227
@@ -19,7 +19,8 @@ P Received: from [V4NET.0.0.4] (ident=root)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <uncheckable@localhost1>)
 	id 10HmaX-0005vi-00
-	for z@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for z@remote.domain;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z
 1999-03-02 09:44:33 10HmaY-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <uncheckable@localhost1>
@@ -28,7 +29,8 @@ P Received: from [V4NET.0.0.4] (ident=root)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <uncheckable@localhost1>)
 	id 10HmaY-0005vi-00
-	for z@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for z@remote.domain;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z
 1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index cd6586cdb..5b3680db7 100644
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -3,7 +3,8 @@ Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <bad@syntax
 I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -12,7 +13,8 @@ Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: bad@domain
 I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -24,7 +26,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	(envelope-from <nosyntax@x>)
 	id 10HmaZ-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <bad@syntax
 I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -33,7 +36,8 @@ Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
 	id 10HmbA-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From: <unverifiable@y>
 I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0451 b/test/rejectlog/0451
index e2616875e..40b70cef1 100644
--- a/test/rejectlog/0451
+++ b/test/rejectlog/0451
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=a.b.c.d)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for good@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -16,7 +17,8 @@ P Received: from CALLER (helo=a.b.c.d)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for good@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index cab143858..2f16fd349 100644
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -3,7 +3,8 @@ Envelope-from: <>
 Envelope-to: <abc@xyz>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+	for abc@xyz;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: abc@xyz.
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index b2ece3e1f..e78a7a14d 100644
--- a/test/rejectlog/0468
+++ b/test/rejectlog/0468
@@ -4,7 +4,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0482 b/test/rejectlog/0482
index 9bbdd8691..e29be3469 100644
--- a/test/rejectlog/0482
+++ b/test/rejectlog/0482
@@ -7,5 +7,6 @@ P Received: from [127.0.0.1] (helo=foobar)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 F From                                                                                                                                                                                                                              : userx
diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index ef53406f4..5ae8529d8 100644
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -4,7 +4,8 @@ Envelope-to: <aa@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for aa@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for aa@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0505 b/test/rejectlog/0505
index 41fd97e5b..b6ec7ace5 100644
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -4,7 +4,8 @@ Envelope-to: <userx@x.y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@x.y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Envelope-to: <userx@myhost.test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index ca6243bd3..2f186fd25 100644
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -4,7 +4,8 @@ Envelope-to: <userx@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -15,7 +16,8 @@ Envelope-to: <userx@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -27,7 +29,8 @@ Envelope-to: <userx@dom.com>
     <userz@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@b.c, himself <usery@dom.com>
 * Cc: unqualified, userx@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z
diff --git a/test/rejectlog/0536 b/test/rejectlog/0536
index bf06473b6..71c95f7ad 100644
--- a/test/rejectlog/0536
+++ b/test/rejectlog/0536
@@ -22,7 +22,8 @@ Envelope-to: <user1@myhost.test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <user1@test.ex>)
 	id 10HmaX-0005vi-00
-	for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for user1@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: user1@test.ex
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -32,7 +33,8 @@ Envelope-to: <user1@myhost.test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <user2@test.ex>)
 	id 10HmaY-0005vi-00
-	for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for user1@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: user2@test.ex
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0539 b/test/rejectlog/0539
index 74da8e6e1..a9bff02b4 100644
--- a/test/rejectlog/0539
+++ b/test/rejectlog/0539
@@ -8,7 +8,8 @@ Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0562 b/test/rejectlog/0562
index e40415254..555ccc9a7 100644
--- a/test/rejectlog/0562
+++ b/test/rejectlog/0562
@@ -10,4 +10,5 @@ P Received: from [127.0.0.1] (helo=abcd)
 	by myhost.test.ex with esmtp (Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0571 b/test/rejectlog/0571
index 435668e9b..6f6a39750 100644
--- a/test/rejectlog/0571
+++ b/test/rejectlog/0571
@@ -4,7 +4,8 @@ Envelope-to: <ok1@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <ted@29.29.0.com>)
 	id 10HmaX-0005vi-00
-	for ok1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for ok1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: ted@29.29.0.com
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0585 b/test/rejectlog/0585
index 993bc4559..ef368aff7 100644
--- a/test/rejectlog/0585
+++ b/test/rejectlog/0585
@@ -4,7 +4,8 @@ Envelope-to: <userx@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: b@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -15,7 +16,8 @@ Envelope-to: <userx@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@dom.com;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: c@b.c, himself <usery@dom.com>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
@@ -27,7 +29,8 @@ Envelope-to: <userx@dom.com>
     <userz@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
-	id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaZ-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 T To: e@b.c, himself <UserY@dom.com>
 * Cc: unqualified, UserX@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, UserX@dom.com, x@y.z
diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index e60a0edd5..36ff19360 100644
--- a/test/rejectlog/2037
+++ b/test/rejectlog/2037
@@ -9,11 +9,13 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	id 10HmaX-0005vi-00
-	for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: test
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index e60a0edd5..36ff19360 100644
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -9,11 +9,13 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
 	id 10HmaX-0005vi-00
-	for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for data_defer@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Subject: test
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
diff --git a/test/rejectlog/2500 b/test/rejectlog/2500
index 8c09f1568..d985da2e5 100644
--- a/test/rejectlog/2500
+++ b/test/rejectlog/2500
@@ -4,7 +4,8 @@ Envelope-to: <tainted@test.ex>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for tainted@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for tainted@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ Envelope-from: <>
 Envelope-to: <CALLER@myhost.test.ex>
 P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
diff --git a/test/rejectlog/4000 b/test/rejectlog/4000
index d401a5e78..e854db0f3 100644
--- a/test/rejectlog/4000
+++ b/test/rejectlog/4000
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: J Caesar <jcaesar@test.ex>
 T To: a-list00@exim.org
diff --git a/test/rejectlog/4006 b/test/rejectlog/4006
index f9626e35a..cd090eae4 100644
--- a/test/rejectlog/4006
+++ b/test/rejectlog/4006
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one due to scanner error
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4007 b/test/rejectlog/4007
index f46e9e71e..2eb5c383c 100644
--- a/test/rejectlog/4007
+++ b/test/rejectlog/4007
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one, the scanner had an error
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one, the scanner had an error
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4008 b/test/rejectlog/4008
index 2c4463ad0..78227194a 100644
--- a/test/rejectlog/4008
+++ b/test/rejectlog/4008
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4009 b/test/rejectlog/4009
index 5aad09639..5709bc3d6 100644
--- a/test/rejectlog/4009
+++ b/test/rejectlog/4009
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4010 b/test/rejectlog/4010
index fbe3b69f0..ecc080411 100644
--- a/test/rejectlog/4010
+++ b/test/rejectlog/4010
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be tmp-rejected due to timeout
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected as the options are not relevant
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4011 b/test/rejectlog/4011
index 16c708986..15a85944a 100644
--- a/test/rejectlog/4011
+++ b/test/rejectlog/4011
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one (daemon tmp-err)
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected (virus found)
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected (virus found)
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4012 b/test/rejectlog/4012
index 8ec883c54..1498e324d 100644
--- a/test/rejectlog/4012
+++ b/test/rejectlog/4012
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4013 b/test/rejectlog/4013
index adeded6fb..5960c5d71 100644
--- a/test/rejectlog/4013
+++ b/test/rejectlog/4013
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be deferred due to timeout
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4014 b/test/rejectlog/4014
index bd26ac2a4..02d29d2c8 100644
--- a/test/rejectlog/4014
+++ b/test/rejectlog/4014
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4017 b/test/rejectlog/4017
index 670b9057b..a5e565ac3 100644
--- a/test/rejectlog/4017
+++ b/test/rejectlog/4017
@@ -5,7 +5,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: defer this one, the scanner had an error
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Subject: message should be rejected
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
diff --git a/test/rejectlog/4506 b/test/rejectlog/4506
index 2d843ee52..95df33e74 100644
--- a/test/rejectlog/4506
+++ b/test/rejectlog/4506
@@ -7,7 +7,8 @@ P Received: from [127.0.0.1] (helo=xxx)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <shouldfail@bloggs.com>)
 	id 10HmaX-0005vi-00
-	for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for a@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
   DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=test.ex; h=from:to
 	:date:message-id:subject; s=sel; bh=OB9dZVu7+5/ufs3TH9leIcEpXSo=;
 F From: mrgus@text.ex
diff --git a/test/rejectlog/5500 b/test/rejectlog/5500
index 6b2ce923e..21b11203a 100644
--- a/test/rejectlog/5500
+++ b/test/rejectlog/5500
@@ -6,5 +6,6 @@ Envelope-to: <userp@test.ex>
     <userq@test.ex>
 P Received: from [127.0.0.1] (helo=rhu.barb)
 	by myhost.test.ex with esmtp (Exim x.yz)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 S Sender: sender@some.where