Use separate line in Received: header for timestamp

28 files changed, 118 insertions, 72 deletions

diff --git a/test/stderr/0022 b/test/stderr/0022
index 510c5499a..dc0e12575 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -51,7 +51,8 @@ P Received: from [V4NET.9.8.7]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbF-0005vi-00
-	for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for warn_empty@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=[V4NET.9.8.7] P=smtp S=sss
 SMTP>> 250 OK id=10HmbF-0005vi-00
@@ -118,7 +119,8 @@ P Received: from [V4NET.9.8.7]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbG-0005vi-00
-	for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for warn_log@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=[V4NET.9.8.7] P=smtp S=sss
 SMTP>> 250 OK id=10HmbG-0005vi-00
@@ -183,7 +185,8 @@ P Received: from [V4NET.9.8.7]
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmbH-0005vi-00
-	for warn_user@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for warn_user@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
   X-ACL-Warn: warn user message
 >>
diff --git a/test/stderr/0044 b/test/stderr/0044
index 5c6e9a99f..399c66c4f 100644
--- a/test/stderr/0044
+++ b/test/stderr/0044
@@ -132,7 +132,8 @@ P Received: from [V4NET.11.12.13] (helo=exim.test.ex)
 	by the.local.host.name with esmtp (Exim x.yz)
 	(envelope-from <postmaster@exim.test.ex>)
 	id 10HmaX-0005vi-00
-	for postmaster@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for postmaster@exim.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
diff --git a/test/stderr/0264 b/test/stderr/0264
index f572148f1..4f0c65ba7 100644
--- a/test/stderr/0264
+++ b/test/stderr/0264
@@ -21,7 +21,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   rz.b@outside 
diff --git a/test/stderr/0275 b/test/stderr/0275
index 4e27129b2..5a1188c40 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -133,7 +133,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -163,7 +164,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0278 b/test/stderr/0278
index 4ea1cf371..727a6b885 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -92,7 +92,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -122,7 +123,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   CALLER@test.ex 
diff --git a/test/stderr/0294 b/test/stderr/0294
index cd0424eb8..c2ffd2d96 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -40,7 +40,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -71,7 +72,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for two@z; Tue, 2 Mar 1999 09:44:33 +0000
+	for two@z;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0303 b/test/stderr/0303
index 5af9bac7f..72ff9e1d1 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -99,7 +99,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from [V4NET.2.3.4]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
@@ -172,7 +173,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from host.name.tld ([V4NET.2.3.4])
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00
diff --git a/test/stderr/0317 b/test/stderr/0317
index 71d883ddd..85ee2740a 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -24,7 +24,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -64,7 +65,8 @@ Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0361 b/test/stderr/0361
index 1eb948586..e77090a21 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -39,7 +39,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by the.local.host.name with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for kilos@recurse.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -68,7 +69,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   kilos@recurse.test.ex 
diff --git a/test/stderr/0371 b/test/stderr/0371
index d24df68e7..d01822978 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -85,7 +85,8 @@ P Received: from [V4NET.0.0.0] (helo=something)
 	by mail.test.ex with esmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "data"
 processing "accept" (TESTSUITE/test-config 37)
 check set acl_m0 = $acl_m0; data
diff --git a/test/stderr/0386 b/test/stderr/0386
index f625344eb..545cf35b0 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -226,7 +226,8 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+	for 2@b;
+	Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
@@ -264,7 +265,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   2@b 
@@ -416,7 +417,8 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
 	by myhost.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaY-0005vi-00
-	for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+	for 2@b;
+	Tue, 2 Mar 1999 09:44:33 +0000
 >>Headers added by MAIL or RCPT ACL:
   X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
   X-Warning: This is a test blacklisting message
@@ -454,7 +456,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   2@b 
diff --git a/test/stderr/0388 b/test/stderr/0388
index 939aba184..95484cca2 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -219,7 +219,8 @@ Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0402 b/test/stderr/0402
index 865bf34be..3b47d10a6 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -151,7 +151,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaX-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: ${tod_full}
  ├──expanding: ${tod_full}
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
@@ -197,7 +198,7 @@ recipients_count=5
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=6
+body_linecount=0 message_linecount=7
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
diff --git a/test/stderr/0403 b/test/stderr/0403
index 939c7f422..e57c974c1 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0404 b/test/stderr/0404
index cf57c90ba..d27d1c5d3 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -131,7 +131,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -163,7 +164,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=159
+body_linecount=0 message_linecount=160
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
@@ -291,7 +292,8 @@ Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
-	id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-0005vi-00;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <sender@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
@@ -1536,7 +1538,7 @@ recipients_count=608
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=9
+body_linecount=1 message_linecount=10
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
 DSN: set orcpt:   flags: 0x0
diff --git a/test/stderr/0408 b/test/stderr/0408
index 1b55f031e..02a6cfea1 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0465 b/test/stderr/0465
index 3f4af9827..bef0e0290 100644
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -77,7 +77,8 @@ Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
+	for abc@domain;
+	Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
 processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax
@@ -144,7 +145,8 @@ Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+	for abc@xyz;
+	Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
 processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax
diff --git a/test/stderr/0471 b/test/stderr/0471
index ba94bd78b..76b9b4a56 100644
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -25709,7 +25709,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for r1@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <r1@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -25866,7 +25867,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for r2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for r2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <r2@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -26022,7 +26024,8 @@ Data file written for message 10HmaZ-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for r3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for r3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 DSN: **** SPOOL_OUT - address: <r3@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
diff --git a/test/stderr/0487 b/test/stderr/0487
index 277fba63b..e59361672 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -57,7 +57,8 @@ P Received: from CALLER (helo=x.y)
 	by myhost.test.ex with local-esmtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -90,7 +91,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=8
+body_linecount=1 message_linecount=9
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/0489 b/test/stderr/0489
index 9a00fed12..ef3c01ca7 100644
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -22,7 +22,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -54,7 +55,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaY-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
@@ -85,7 +87,8 @@ Data file written for message 10HmaZ-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
 Size of headers = sss
@@ -116,7 +119,8 @@ Data file written for message 10HmbA-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
 Size of headers = sss
@@ -147,7 +151,8 @@ Data file written for message 10HmbB-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H
 Size of headers = sss
@@ -178,7 +183,8 @@ Data file written for message 10HmbC-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbC-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H
 Size of headers = sss
@@ -209,7 +215,8 @@ Data file written for message 10HmbD-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbD-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H
 Size of headers = sss
@@ -240,7 +247,8 @@ Data file written for message 10HmbE-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbE-0005vi-00
-	for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for X@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-0005vi-00
 Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H
 Size of headers = sss
diff --git a/test/stderr/0575 b/test/stderr/0575
index 7e6ac1c3e..845b2c362 100644
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -46,7 +46,8 @@ P Received: from [V4NET.0.0.0]
 	by mail.test.ex with smtp (Exim x.yz)
 	(envelope-from <x@y>)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= x@y H=[V4NET.0.0.0] P=smtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
diff --git a/test/stderr/0911 b/test/stderr/0911
index 6a6645ded..9ea7f1f25 100644
--- a/test/stderr/0911
+++ b/test/stderr/0911
@@ -40,7 +40,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 313 LAST
+  SMTP+> BDAT 315 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
@@ -104,7 +104,7 @@ cmd buf flush ddd bytes
 sync_responses expect rcpt for nopipe@test.ex
   SMTP<< 250 OK rcpt
          will write message using CHUNKING
-  SMTP+> BDAT 315 LAST
+  SMTP+> BDAT 317 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300
@@ -169,7 +169,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 319 LAST
+  SMTP+> BDAT 321 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
@@ -238,7 +238,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 319 LAST
+  SMTP+> BDAT 321 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
@@ -307,7 +307,7 @@ transport_check_waiting entered
  no messages waiting for 127.0.0.1
 transport_check_waiting: FALSE
 will pipeline QUIT
-  SMTP+> BDAT 317 LAST
+  SMTP+> BDAT 319 LAST
 cmd buf flush ddd bytes (more expected)
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=300 (more expected)
diff --git a/test/stderr/2600 b/test/stderr/2600
index e0463403a..869198a37 100644
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -443,7 +443,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -473,7 +474,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@myhost.test.ex 
diff --git a/test/stderr/2610 b/test/stderr/2610
index 7a430b6c9..73812a2c7 100644
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -441,7 +441,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for ph10@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for ph10@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <ph10@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -471,7 +472,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   ph10@myhost.test.ex 
diff --git a/test/stderr/2620 b/test/stderr/2620
index 289471282..5a4cbb335 100644
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -498,7 +498,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaX-0005vi-00
-	for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for CALLER@myhost.test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <CALLER@myhost.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -528,7 +529,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   CALLER@myhost.test.ex 
diff --git a/test/stderr/5004 b/test/stderr/5004
index 56ae012a5..1cd68d193 100644
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -34,7 +34,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -66,7 +67,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/5005 b/test/stderr/5005
index c01854665..47852e4fe 100644
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for nofile@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <nofile@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   nofile@test.ex 
@@ -219,7 +220,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaY-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
@@ -248,7 +250,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
@@ -406,7 +408,8 @@ Data file written for message 10HmaZ-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaZ-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
@@ -435,7 +438,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
@@ -599,7 +602,8 @@ Data file written for message 10HmbA-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmbA-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
@@ -628,7 +632,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
diff --git a/test/stderr/5006 b/test/stderr/5006
index 250352ffb..21959bb66 100644
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -32,7 +32,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	(envelope-from <CALLER@test.ex>)
 	id 10HmaX-0005vi-00
-	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	for userx@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
@@ -62,7 +63,7 @@ Non-recipients:
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=1 message_linecount=7
+body_linecount=1 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex