[exim-cvs] Use separate line in Received: header for timesta…

Inizio della pagina
Delete this message
Reply to this message
Autore: Exim Git Commits Mailing List
Data:  
To: exim-cvs
Oggetto: [exim-cvs] Use separate line in Received: header for timestamp
Gitweb: https://git.exim.org/exim.git/commitdiff/eae427c645a7d0e2051b0600d2e4235789740132
Commit:     eae427c645a7d0e2051b0600d2e4235789740132
Parent:     dea98726252e8f5477d7539e368d6768d7f6001c
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Tue May 25 01:35:43 2021 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue May 25 01:35:43 2021 +0100


    Use separate line in Received: header for timestamp
---
 src/src/receive.c                                  | 13 ++---
 test/confs/0420                                    |  2 +-
 test/log/0420                                      |  4 +-
 test/log/5100                                      | 12 ++--
 test/log/5101                                      |  6 +-
 test/mail/0005.CALLER                              | 15 +++--
 test/mail/0006.CALLER                              |  9 ++-
 test/mail/0008.CALLER                              |  3 +-
 test/mail/0009.CALLER                              |  3 +-
 test/mail/0010.CALLER                              |  3 +-
 test/mail/0011.CALLER                              |  3 +-
 test/mail/0014.userx                               |  6 +-
 test/mail/0015.CALLER                              | 12 ++--
 test/mail/0015.userx                               | 21 ++++---
 test/mail/0016.userx                               |  6 +-
 test/mail/0021.CALLER                              |  3 +-
 test/mail/0021.ok                                  | 12 ++--
 test/mail/0021.userx                               | 21 ++++---
 test/mail/0021.x                                   |  6 +-
 test/mail/0023.cond-                               |  3 +-
 test/mail/0023.cond--1                             |  3 +-
 test/mail/0023.cond-0                              |  3 +-
 test/mail/0023.cond-00                             |  3 +-
 test/mail/0023.cond-1                              |  3 +-
 test/mail/0023.cond-10                             |  3 +-
 test/mail/0023.cond-false                          |  3 +-
 test/mail/0023.cond-no                             |  3 +-
 test/mail/0023.cond-rhubarb                        |  6 +-
 test/mail/0023.cond-true                           |  3 +-
 test/mail/0023.cond-yes                            |  6 +-
 test/mail/0023.okbatch                             |  3 +-
 test/mail/0023.userx                               |  6 +-
 test/mail/0023.userx-vs                            |  3 +-
 test/mail/0024.postmaster                          | 12 ++--
 test/mail/0024.userx                               |  6 +-
 test/mail/0025.userx                               |  3 +-
 test/mail/0026.userx                               |  9 ++-
 test/mail/0031.CALLER                              |  3 +-
 test/mail/0032.CALLER                              |  6 +-
 test/mail/0036.abcd                                |  6 +-
 test/mail/0036.userx                               |  6 +-
 test/mail/0037.CALLER                              | 66 ++++++++++++++--------
 test/mail/0037.dff                                 |  3 +-
 test/mail/0037.postmaster                          |  6 +-
 test/mail/0037.userx                               | 15 +++--
 test/mail/0037.userz                               | 21 ++++---
 test/mail/0040.userx                               |  6 +-
 test/mail/0048.CALLER                              | 45 ++++++++++-----
 test/mail/0049.userx                               | 30 ++++++----
 test/mail/0050.userx                               | 33 +++++++----
 test/mail/0051.CALLER                              | 24 +++++---
 test/mail/0051.userx                               | 12 ++--
 test/mail/0052.!one                                |  3 +-
 test/mail/0052.CALLER                              | 12 ++--
 test/mail/0052.yy99                                |  3 +-
 test/mail/0055.userx                               |  3 +-
 test/mail/0072.CALLER                              | 21 ++++---
 test/mail/0073.CALLER                              |  6 +-
 test/mail/0074.CALLER                              |  6 +-
 test/mail/0074.userx                               | 21 ++++---
 test/mail/0075.subdir/userx                        |  3 +-
 test/mail/0079.rbl                                 |  6 +-
 test/mail/0079.userx                               | 12 ++--
 test/mail/0081.userx                               |  3 +-
 test/mail/0082.userx                               |  3 +-
 test/mail/0083.userx                               |  3 +-
 test/mail/0090.CALLER                              |  3 +-
 test/mail/0094.userx                               |  9 ++-
 test/mail/0095.userx                               | 24 +++++---
 test/mail/0095.userz                               |  3 +-
 test/mail/0095.userz.bounce                        |  3 +-
 test/mail/0096.userx                               |  6 +-
 test/mail/0097.userx                               |  6 +-
 test/mail/0098.CALLER                              | 48 ++++++++++------
 test/mail/0100.CALLER                              |  3 +-
 test/mail/0100.userw                               |  3 +-
 test/mail/0100.userx                               | 30 ++++++----
 test/mail/0100.usery                               |  3 +-
 test/mail/0100.userz                               |  3 +-
 test/mail/0101.userx                               | 30 ++++++----
 test/mail/0101.userz                               |  3 +-
 test/mail/0102.batched                             |  6 +-
 test/mail/0102.userx                               |  6 +-
 test/mail/0102.usery                               |  6 +-
 test/mail/0102.userz                               |  9 ++-
 test/mail/0103.CALLER                              | 12 ++--
 test/mail/0103.rewritten                           |  3 +-
 test/mail/0104.mmm                                 |  3 +-
 test/mail/0104.yyy                                 |  3 +-
 test/mail/0105.default                             |  3 +-
 test/mail/0105.firstuser                           |  3 +-
 test/mail/0105.seconduser                          |  3 +-
 test/mail/0110.second                              |  3 +-
 test/mail/0111.userx                               |  9 ++-
 test/mail/0112.file                                |  3 +-
 test/mail/0112.pipe                                |  3 +-
 test/mail/0113.second                              |  3 +-
 test/mail/0114.file                                |  6 +-
 test/mail/0114.pipe                                |  3 +-
 test/mail/0115.file                                | 12 ++--
 test/mail/0116.acopy                               |  3 +-
 test/mail/0116.alias1                              |  3 +-
 test/mail/0116.alias2                              |  3 +-
 test/mail/0116.dcopy                               |  6 +-
 test/mail/0118.userx                               |  3 +-
 test/mail/0127.userx                               | 30 ++++++----
 test/mail/0131.copy                                |  3 +-
 test/mail/0131.userx                               |  3 +-
 test/mail/0133.dddd                                |  6 +-
 test/mail/0134.UC-USERX                            |  3 +-
 test/mail/0134.directfile                          |  3 +-
 test/mail/0134.lc-unknown                          |  9 ++-
 test/mail/0134.lc-userx                            | 12 ++--
 test/mail/0136.forwarder                           | 12 ++--
 test/mail/0137.userx                               | 12 ++--
 test/mail/0139.userx                               |  3 +-
 test/mail/0140.CALLER                              |  9 ++-
 test/mail/0142.CALLER                              |  6 +-
 test/mail/0142.filter                              |  3 +-
 test/mail/0150.postmaster                          |  3 +-
 test/mail/0151.postmaster                          |  3 +-
 test/mail/0152.postmaster                          | 24 +++++---
 test/mail/0159.userx                               | 12 ++--
 test/mail/0164.CALLER                              | 18 ++++--
 test/mail/0165.CALLER                              | 18 ++++--
 test/mail/0166.userx                               |  3 +-
 test/mail/0166.usery                               |  3 +-
 test/mail/0167.userx                               |  9 ++-
 test/mail/0169.userx                               |  9 ++-
 test/mail/0171.CALLER                              |  3 +-
 test/mail/0173.userx                               | 12 ++--
 test/mail/0173.usery                               |  6 +-
 test/mail/0173.userz                               |  6 +-
 test/mail/0174.CALLER                              |  9 ++-
 test/mail/0174.userx                               | 18 ++++--
 test/mail/0174.usery                               |  6 +-
 test/mail/0174.userz                               |  6 +-
 test/mail/0176.CALLER                              |  6 +-
 test/mail/0177.CALLER                              |  6 +-
 test/mail/0177.userx                               |  9 ++-
 test/mail/0177.usery                               | 15 +++--
 test/mail/0182.userx                               |  3 +-
 test/mail/0189.userx                               |  6 +-
 test/mail/0192.userx                               |  6 +-
 test/mail/0194.CALLER                              | 18 ++++--
 test/mail/0197.copies                              |  6 +-
 test/mail/0202.userx                               | 12 ++--
 test/mail/0205.redirected                          |  3 +-
 test/mail/0205.x                                   |  3 +-
 test/mail/0210.file                                |  3 +-
 test/mail/0210.pipe                                |  3 +-
 test/mail/0211.CALLER                              | 12 ++--
 test/mail/0220.userx                               | 15 +++--
 test/mail/0221.userx                               | 12 ++--
 test/mail/0222.foo1                                |  6 +-
 test/mail/0222.foo2                                |  3 +-
 test/mail/0222.foo3                                |  3 +-
 test/mail/0223.CALLER                              |  6 +-
 test/mail/0224.CALLER                              | 12 ++--
 test/mail/0226.CALLER                              | 15 +++--
 test/mail/0226.file                                |  3 +-
 test/mail/0230.x                                   | 12 ++--
 test/mail/0231.a                                   |  3 +-
 test/mail/0231.b                                   |  3 +-
 test/mail/0233.me                                  |  9 ++-
 test/mail/0233.postmaster                          |  3 +-
 test/mail/0237.CALLER                              | 15 +++--
 test/mail/0237.file                                |  3 +-
 test/mail/0240.subdir/userx                        |  3 +-
 test/mail/0241.userx                               |  3 +-
 test/mail/0243.CALLER                              |  3 +-
 test/mail/0246.CALLER                              |  3 +-
 test/mail/0252.t1                                  | 12 ++--
 test/mail/0252.t2                                  | 12 ++--
 test/mail/0253.lmn                                 |  6 +-
 test/mail/0253.t1                                  |  3 +-
 test/mail/0253.t2                                  |  3 +-
 test/mail/0256.CALLER                              |  6 +-
 test/mail/0256.abc@def                             |  6 +-
 test/mail/0256.abcd+test.ex+xxxx                   |  6 +-
 "test/mail/0256.abcd+unknown.domain+\"abc@def\""   |  6 +-
 test/mail/0258.userx                               | 30 ++++++----
 test/mail/0260.userx                               |  3 +-
 test/mail/0266.CALLER                              |  6 +-
 test/mail/0266.filter                              |  3 +-
 test/mail/0266.filter2                             |  3 +-
 test/mail/0266.filter3                             |  3 +-
 test/mail/0266.list2                               |  3 +-
 test/mail/0266.postmaster                          | 18 ++++--
 test/mail/0266.spqr                                |  3 +-
 test/mail/0266.userx                               |  3 +-
 test/mail/0270.CALLER                              |  6 +-
 test/mail/0270.filter                              |  3 +-
 test/mail/0270.filter2                             |  3 +-
 test/mail/0270.filter3                             |  3 +-
 test/mail/0270.list2                               |  3 +-
 test/mail/0270.postmaster                          | 18 ++++--
 test/mail/0270.spqr                                |  3 +-
 test/mail/0270.userx                               |  3 +-
 test/mail/0274.abcd                                |  3 +-
 test/mail/0274.redirect                            |  3 +-
 test/mail/0274.userx                               |  3 +-
 test/mail/0274.xyz                                 |  3 +-
 test/mail/0280.CALLER                              | 12 ++--
 test/mail/0282.userx                               |  6 +-
 test/mail/0283.CALLER                              |  6 +-
 test/mail/0284.batched                             |  9 ++-
 test/mail/0284.other.domain                        |  3 +-
 test/mail/0284.test.ex                             |  3 +-
 test/mail/0284.x-t2                                |  3 +-
 test/mail/0284.y-t2                                |  3 +-
 test/mail/0289.CALLER                              |  3 +-
 test/mail/0296.CALLER                              |  6 +-
 test/mail/0298.CALLER                              | 12 ++--
 test/mail/0306.anyone                              | 12 ++--
 test/mail/0307.anyone                              | 12 ++--
 test/mail/0309.CALLER                              |  6 +-
 test/mail/0310.CALLER                              |  6 +-
 test/mail/0318.subdir/userx                        |  3 +-
 test/mail/0319.saved                               |  3 +-
 test/mail/0321.CALLER                              |  6 +-
 test/mail/0324.userx                               |  3 +-
 test/mail/0326.userx                               |  9 ++-
 test/mail/0327.userx                               |  6 +-
 test/mail/0328.userx                               |  3 +-
 test/mail/0329.userx                               |  3 +-
 test/mail/0330.userz1                              |  9 ++-
 test/mail/0335.batch                               |  3 +-
 test/mail/0335.clone                               |  3 +-
 test/mail/0335.final                               |  9 ++-
 test/mail/0338.a1-userx                            |  3 +-
 test/mail/0338.a2-userx                            |  3 +-
 test/mail/0341.mailbox                             |  3 +-
 test/mail/0346.x                                   |  3 +-
 test/mail/0349.xxxx                                |  3 +-
 test/mail/0351.userx                               |  6 +-
 test/mail/0352.userx                               | 12 ++--
 test/mail/0359.userx                               |  3 +-
 test/mail/0374.CALLER                              |  6 +-
 test/mail/0374.a1                                  |  3 +-
 test/mail/0374.a1-u                                |  3 +-
 test/mail/0374.b1                                  |  3 +-
 test/mail/0374.c1                                  |  3 +-
 test/mail/0374.d1                                  |  3 +-
 test/mail/0374.d2                                  |  3 +-
 test/mail/0374.d3                                  |  3 +-
 test/mail/0375.CALLER                              |  6 +-
 test/mail/0375.a1                                  |  3 +-
 test/mail/0375.a1-u                                |  3 +-
 test/mail/0375.b1                                  |  3 +-
 test/mail/0375.c1                                  |  3 +-
 test/mail/0375.d1                                  |  3 +-
 test/mail/0375.d2                                  |  3 +-
 test/mail/0375.d3                                  |  3 +-
 test/mail/0375.e1                                  |  3 +-
 test/mail/0375.f1                                  |  3 +-
 test/mail/0375.f2                                  |  3 +-
 test/mail/0375.f3                                  |  3 +-
 test/mail/0375.h1                                  |  3 +-
 test/mail/0375.h1-u                                |  3 +-
 test/mail/0377.aaaa                                |  3 +-
 test/mail/0377.bbbb                                |  3 +-
 test/mail/0377.cccc                                |  3 +-
 test/mail/0378.file                                |  3 +-
 test/mail/0379.bbbb                                |  3 +-
 test/mail/0379.cccc                                |  3 +-
 test/mail/0380.bbbb                                |  3 +-
 test/mail/0383.CALLER                              | 27 ++++++---
 test/mail/0385.CALLER                              | 24 +++++---
 test/mail/0386.2                                   |  6 +-
 test/mail/0393.userx                               |  9 ++-
 test/mail/0395.CALLER                              |  3 +-
 test/mail/0395.userx                               | 24 +++++---
 test/mail/0398.x                                   |  3 +-
 test/mail/0404.sender                              |  3 +-
 test/mail/0408.userx                               |  3 +-
 test/mail/0411.afolder                             |  6 +-
 test/mail/0412.CALLER                              | 12 ++--
 test/mail/0421.a                                   |  3 +-
 test/mail/0428.CALLER                              | 12 ++--
 test/mail/0428.inbox.JUNK                          | 12 ++--
 test/mail/0428.redirected                          |  3 +-
 test/mail/0428.someone                             |  3 +-
 test/mail/0428.userx                               |  6 +-
 test/mail/0428.userx-extra                         |  3 +-
 test/mail/0428.userx-sawsuffix                     |  3 +-
 test/mail/0428.userx13                             |  3 +-
 test/mail/0428.userx14                             |  3 +-
 test/mail/0428.userx9                              |  3 +-
 test/mail/0431.xxx                                 |  6 +-
 test/mail/0436.CALLER                              |  3 +-
 test/mail/0437.file                                |  6 +-
 test/mail/0444.CALLER                              |  6 +-
 test/mail/0444.userx                               |  3 +-
 test/mail/0446.userx                               |  6 +-
 test/mail/0449.userx                               |  3 +-
 test/mail/0452.CALLER                              |  9 ++-
 test/mail/0452.userx                               |  3 +-
 test/mail/0460.userx                               |  6 +-
 test/mail/0461.CALLER                              | 18 ++++--
 test/mail/0472.userz99                             |  6 +-
 test/mail/0480.userx                               |  3 +-
 test/mail/0481.userx                               |  6 +-
 test/mail/0485.userx                               |  6 +-
 test/mail/0487.userx                               |  3 +-
 test/mail/0491.userx                               | 21 ++++---
 test/mail/0493.a                                   |  3 +-
 test/mail/0494.userx                               |  3 +-
 test/mail/0496.someone                             |  3 +-
 test/mail/0500.userx                               |  3 +-
 test/mail/0503.userx                               |  3 +-
 test/mail/0508.postmaster                          |  6 +-
 test/mail/0514.userx                               |  3 +-
 test/mail/0517.userx                               |  3 +-
 test/mail/0517.usery                               |  3 +-
 test/mail/0522.CALLER                              | 12 ++--
 test/mail/0523.userx                               |  3 +-
 test/mail/0530.CALLER                              | 30 ++++++----
 test/mail/0531.CALLER                              | 18 ++++--
 test/mail/0532.rcptok                              |  6 +-
 test/mail/0533.mbox                                |  3 +-
 test/mail/0533.mbox2                               |  3 +-
 test/mail/0535.userx                               | 12 ++--
 test/mail/0536.oksender                            |  6 +-
 test/mail/0536.user1                               |  6 +-
 test/mail/0536.user2                               |  6 +-
 test/mail/0551.userx                               |  9 ++-
 test/mail/0551.usery                               |  3 +-
 test/mail/0551.userz                               |  3 +-
 test/mail/0566.userx                               |  9 ++-
 test/mail/0567.rcptok                              |  6 +-
 test/mail/0573.limited                             |  6 +-
 test/mail/0573.not_limited                         |  6 +-
 test/mail/0580.local                               |  3 +-
 test/mail/0600.CALLER                              | 10 ++--
 test/mail/0606.b                                   |  3 +-
 test/mail/0608.bounce_message                      | 66 ++++++++++++++--------
 test/mail/0612.rmt_accept                          |  6 +-
 test/mail/0906.a                                   |  8 ++-
 test/mail/1001.userx                               |  9 ++-
 test/mail/1103.userx                               |  3 +-
 test/mail/1104.userx                               |  3 +-
 test/mail/1110.userx                               |  6 +-
 test/mail/1150.CALLER                              | 12 ++--
 test/mail/1150.abcd                                |  6 +-
 test/mail/1150.xyz                                 |  6 +-
 test/mail/1157.usera                               |  6 +-
 test/mail/1157.userb                               |  6 +-
 test/mail/1157.userc                               |  6 +-
 test/mail/1157.userx                               |  6 +-
 test/mail/1157.usery                               |  6 +-
 test/mail/1157.userz                               |  6 +-
 test/mail/1159.userx                               | 12 ++--
 test/mail/1160.CALLER                              | 12 ++--
 test/mail/1160.abcd                                |  6 +-
 test/mail/1160.xyz                                 |  6 +-
 test/mail/1163.userx0                              |  6 +-
 test/mail/1163.userx1                              |  6 +-
 test/mail/1163.usery0                              |  6 +-
 test/mail/1163.usery1                              |  6 +-
 test/mail/1163.userz0                              |  6 +-
 test/mail/1163.userz1                              |  6 +-
 test/mail/2002.CALLER                              | 15 +++--
 test/mail/2027.userx                               |  6 +-
 test/mail/2027.usery                               |  6 +-
 test/mail/2102.CALLER                              | 12 ++--
 test/mail/2127.userx                               |  6 +-
 test/mail/2127.usery                               |  6 +-
 test/mail/2132.CALLER                              |  9 ++-
 test/mail/2149.userx                               |  6 +-
 test/mail/2600.userx                               |  3 +-
 test/mail/2610.ph10                                |  3 +-
 test/mail/2620.ph10                                |  3 +-
 test/mail/3400.userx                               | 27 ++++++---
 test/mail/3403.userx                               |  3 +-
 test/mail/3411.postmaster                          |  3 +-
 test/mail/3411.userx                               |  3 +-
 test/mail/3451.userx                               | 18 ++++--
 test/mail/3452.userx                               | 12 ++--
 test/mail/3461.userx                               | 18 ++++--
 test/mail/3462.userx                               | 12 ++--
 test/mail/3500.userx                               |  3 +-
 test/mail/3700.smtps                               |  6 +-
 test/mail/3700.x                                   |  6 +-
 test/mail/4000.userx                               | 21 ++++---
 test/mail/4002.userx                               |  6 +-
 ...40\245\207\340\244\271\340\245\210\340\244\202" |  6 +-
 ...40\245\207\340\244\271\340\245\210\340\244\202" |  6 +-
 ...40\245\207\340\244\271\340\245\210\340\244\202" |  6 +-
 test/mail/4520.a                                   |  6 +-
 test/mail/4520.b                                   |  6 +-
 test/mail/4520.b10                                 |  6 +-
 test/mail/4520.b12                                 |  6 +-
 test/mail/4520.b20                                 |  6 +-
 test/mail/4520.b22                                 |  6 +-
 test/mail/4520.d                                   |  6 +-
 test/mail/4520.e                                   |  6 +-
 test/mail/4520.f                                   |  6 +-
 test/mail/4523.a                                   |  6 +-
 test/mail/4524.c                                   |  6 +-
 test/mail/4525.a                                   |  6 +-
 test/mail/4525.b                                   | 12 ++--
 test/mail/4525.c                                   | 12 ++--
 test/mail/4530.y                                   |  8 ++-
 test/mail/4530.z                                   |  8 ++-
 test/mail/4541.a                                   |  6 +-
 test/mail/4541.b                                   |  6 +-
 test/mail/4545.a                                   |  6 +-
 test/mail/4545.b                                   |  6 +-
 test/mail/4550.store                               |  9 ++-
 test/mail/4560.a                                   | 66 ++++++++++++++--------
 test/mail/4561.a                                   |  3 +-
 test/mail/4562.a                                   |  6 +-
 test/mail/4563.a                                   |  3 +-
 test/mail/4565.a                                   |  6 +-
 test/mail/4620.CALLER                              | 12 ++--
 test/mail/4620.fred[                               | 12 ++--
 test/mail/4700.CALLER                              | 12 ++--
 test/mail/5000.new/1.myhost.test.ex                |  3 +-
 test/mail/5000.new/2.myhost.test.ex                |  3 +-
 test/mail/5000.new/3.myhost.test.ex:S370           |  3 +-
 test/mail/5000.new/4.myhost.test.ex,S=370          |  3 +-
 test/mail/5000.new/5.myhost.test.ex                |  3 +-
 test/mail/5000.new/6.myhost.test.ex                |  3 +-
 test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S |  3 +-
 test/mail/5002.new/1.myhost.test.ex                |  3 +-
 test/mail/5004.new/1.mail.test.ex                  |  3 +-
 test/mail/5005.nofile/new/1.myhost.test.ex         |  3 +-
 test/mail/5005.userx/new/2.myhost.test.ex          |  3 +-
 test/mail/5006.userx/new/1.myhost.test.ex          |  3 +-
 test/mail/5007.userx/new/1.myhost.test.ex          |  3 +-
 test/mail/5010.new/1.myhost.test.ex                |  3 +-
 test/mail/5012.new/1.myhost.test.ex                |  3 +-
 test/mail/5012.new/2.myhost.test.ex                |  3 +-
 test/mail/5050.userx                               |  6 +-
 test/mail/5050.usery                               |  3 +-
 test/mail/5050.userz                               |  9 ++-
 test/mail/5101.copied                              | 15 +++--
 test/mail/5200.postmaster                          |  3 +-
 test/mail/5203.userx                               |  3 +-
 test/mail/5204.CALLER                              |  6 +-
 test/mail/5207.qpgm                                |  6 +-
 test/mail/5500.user1                               |  3 +-
 test/mail/5500.userx                               |  6 +-
 test/mail/5902.user1                               |  3 +-
 test/rejectlog/0021                                | 15 +++--
 test/rejectlog/0026                                | 18 ++++--
 test/rejectlog/0027                                |  9 ++-
 test/rejectlog/0028                                |  3 +-
 test/rejectlog/0162                                |  3 +-
 test/rejectlog/0214                                |  3 +-
 test/rejectlog/0227                                |  6 +-
 test/rejectlog/0365                                | 12 ++--
 test/rejectlog/0451                                |  6 +-
 test/rejectlog/0465                                |  3 +-
 test/rejectlog/0468                                |  6 +-
 test/rejectlog/0482                                |  3 +-
 test/rejectlog/0490                                |  3 +-
 test/rejectlog/0505                                |  6 +-
 test/rejectlog/0507                                |  9 ++-
 test/rejectlog/0536                                |  6 +-
 test/rejectlog/0539                                |  3 +-
 test/rejectlog/0562                                |  3 +-
 test/rejectlog/0571                                |  3 +-
 test/rejectlog/0585                                |  9 ++-
 test/rejectlog/2037                                |  6 +-
 test/rejectlog/2137                                |  6 +-
 test/rejectlog/2500                                |  6 +-
 test/rejectlog/4000                                |  3 +-
 test/rejectlog/4006                                |  9 ++-
 test/rejectlog/4007                                | 12 ++--
 test/rejectlog/4008                                |  6 +-
 test/rejectlog/4009                                |  9 ++-
 test/rejectlog/4010                                |  9 ++-
 test/rejectlog/4011                                | 12 ++--
 test/rejectlog/4012                                |  6 +-
 test/rejectlog/4013                                |  6 +-
 test/rejectlog/4014                                |  3 +-
 test/rejectlog/4017                                | 12 ++--
 test/rejectlog/4506                                |  3 +-
 test/rejectlog/5500                                |  3 +-
 test/scripts/0000-Basic/0904                       | 52 ++++++++---------
 test/scripts/0000-Basic/0905                       | 40 ++++++-------
 test/scripts/0000-Basic/0911                       | 20 +++----
 test/scripts/4000-scanning/4003                    |  4 ++
 test/scripts/4000-scanning/4004                    |  1 +
 test/scripts/4006_scan_clamd/4006                  |  1 +
 test/scripts/4015-scan-ipv6/4015                   |  1 +
 test/scripts/5500-PRDR/5591                        |  4 +-
 test/scripts/5800-DANE/5800                        |  2 +-
 test/stderr/0022                                   |  9 ++-
 test/stderr/0044                                   |  3 +-
 test/stderr/0264                                   |  2 +-
 test/stderr/0275                                   |  5 +-
 test/stderr/0278                                   |  5 +-
 test/stderr/0294                                   |  6 +-
 test/stderr/0303                                   |  6 +-
 test/stderr/0317                                   |  6 +-
 test/stderr/0361                                   |  5 +-
 test/stderr/0371                                   |  3 +-
 test/stderr/0386                                   | 10 ++--
 test/stderr/0388                                   |  3 +-
 test/stderr/0402                                   |  5 +-
 test/stderr/0403                                   |  5 +-
 test/stderr/0404                                   | 10 ++--
 test/stderr/0408                                   |  5 +-
 test/stderr/0465                                   |  6 +-
 test/stderr/0471                                   |  9 ++-
 test/stderr/0487                                   |  5 +-
 test/stderr/0489                                   | 24 +++++---
 test/stderr/0575                                   |  3 +-
 test/stderr/0911                                   | 10 ++--
 test/stderr/2600                                   |  5 +-
 test/stderr/2610                                   |  5 +-
 test/stderr/2620                                   |  5 +-
 test/stderr/5004                                   |  5 +-
 test/stderr/5005                                   | 20 ++++---
 test/stderr/5006                                   |  5 +-
 test/stdout/0015                                   |  6 +-
 test/stdout/0033                                   |  6 +-
 test/stdout/0035                                   | 21 ++++---
 test/stdout/0100                                   |  6 +-
 test/stdout/0101                                   |  3 +-
 test/stdout/0143                                   |  3 +-
 test/stdout/0163                                   |  3 +-
 test/stdout/0177                                   |  3 +-
 test/stdout/0179                                   |  6 +-
 test/stdout/0185                                   |  3 +-
 test/stdout/0190                                   | 18 ++++--
 test/stdout/0203                                   |  3 +-
 test/stdout/0209                                   |  3 +-
 test/stdout/0210                                   |  3 +-
 test/stdout/0215                                   | 18 ++++--
 test/stdout/0217                                   | 15 +++--
 test/stdout/0218                                   |  9 ++-
 test/stdout/0231                                   |  3 +-
 test/stdout/0242                                   |  6 +-
 test/stdout/0245                                   |  3 +-
 test/stdout/0250                                   |  9 ++-
 test/stdout/0253                                   |  6 +-
 test/stdout/0254                                   |  9 ++-
 test/stdout/0285                                   | 15 +++--
 test/stdout/0286                                   | 15 +++--
 test/stdout/0288                                   |  6 +-
 test/stdout/0299                                   |  6 +-
 test/stdout/0311                                   |  6 +-
 test/stdout/0332                                   |  6 +-
 test/stdout/0333                                   |  6 +-
 test/stdout/0338                                   |  3 +-
 test/stdout/0363                                   |  3 +-
 test/stdout/0367                                   | 12 ++--
 test/stdout/0374                                   |  3 +-
 test/stdout/0375                                   |  6 +-
 test/stdout/0377                                   |  3 +-
 test/stdout/0378                                   |  3 +-
 test/stdout/0379                                   |  3 +-
 test/stdout/0389                                   |  3 +-
 test/stdout/0431                                   |  6 +-
 test/stdout/0440                                   |  9 ++-
 test/stdout/0461                                   |  9 ++-
 test/stdout/0467                                   |  3 +-
 test/stdout/0474                                   |  3 +-
 test/stdout/0488                                   |  3 +-
 test/stdout/0490                                   |  3 +-
 test/stdout/0495                                   |  9 ++-
 test/stdout/0497                                   |  6 +-
 test/stdout/0498                                   |  3 +-
 test/stdout/0514                                   |  3 +-
 test/stdout/0531                                   |  9 ++-
 test/stdout/0543                                   |  3 +-
 test/stdout/0554                                   |  3 +-
 test/stdout/0560                                   |  3 +-
 test/stdout/0565                                   |  6 +-
 test/stdout/0580                                   | 15 +++--
 test/stdout/0616                                   |  3 +-
 test/stdout/0617                                   |  3 +-
 test/stdout/0623                                   | 15 +++--
 test/stdout/0904                                   | 24 ++++----
 test/stdout/0905                                   | 20 +++----
 test/stdout/0911                                   | 10 ++--
 test/stdout/1161                                   |  3 +-
 test/stdout/3401                                   | 15 +++--
 test/stdout/3404                                   |  9 ++-
 test/stdout/3405                                   |  6 +-
 test/stdout/3412                                   |  6 +-
 test/stdout/3415                                   | 15 +++--
 test/stdout/3501                                   |  3 +-
 test/stdout/4003                                   | 12 ++--
 test/stdout/4004                                   |  3 +-
 test/stdout/4006                                   |  3 +-
 test/stdout/4015                                   |  5 +-
 test/stdout/4052                                   | 18 ++++--
 test/stdout/4711                                   | 24 +++++---
 test/stdout/4712                                   | 12 ++--
 test/stdout/4713                                   | 12 ++--
 test/stdout/4714                                   | 18 ++++--
 test/stdout/5102                                   |  6 +-
 test/stdout/5400                                   | 39 ++++++++-----
 test/stdout/5401                                   |  6 +-
 test/stdout/5402                                   |  3 +-
 test/stdout/5404                                   |  3 +-
 test/stdout/5405                                   | 18 ++++--
 test/stdout/5406                                   | 12 ++--
 test/stdout/5407                                   |  3 +-
 test/stdout/5409                                   |  3 +-
 test/stdout/5510                                   | 24 +++++---
 test/stdout/5591                                   |  2 +-
 test/stdout/5700                                   |  9 ++-
 test/stdout/5702                                   |  3 +-
 609 files changed, 2982 insertions(+), 1554 deletions(-)


diff --git a/src/src/receive.c b/src/src/receive.c
index ce7da57..b0dacbd 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -492,7 +492,7 @@ if (recipients_count >= recipients_list_max)
   int oldmax = recipients_list_max;
   recipients_list_max = recipients_list_max ? 2*recipients_list_max : 50;
   recipients_list = store_get(recipients_list_max * sizeof(recipient_item), FALSE);
-  if (oldlist != NULL)
+  if (oldlist)
     memcpy(recipients_list, oldlist, oldmax * sizeof(recipient_item));
   }


@@ -1516,11 +1516,10 @@ return TRUE;
void
received_header_gen(void)
{
-uschar *received;
-uschar *timestamp;
-header_line *received_header= header_list;
+uschar * received;
+uschar * timestamp = expand_string(US"${tod_full}");
+header_line * received_header= header_list;

-timestamp = expand_string(US"${tod_full}");
if (recipients_count == 1) received_for = recipients_list[0].address;
received = expand_string(received_header_text);
received_for = NULL;
@@ -1539,14 +1538,14 @@ so all we have to do is fill in the text pointer, and set the type. However, if
the result of the expansion is an empty string, we leave the header marked as
"old" so as to refrain from adding a Received header. */

-if (received[0] == 0)
+if (!received[0])
{
received_header->text = string_sprintf("Received: ; %s\n", timestamp);
received_header->type = htype_old;
}
else
{
- received_header->text = string_sprintf("%s; %s\n", received, timestamp);
+ received_header->text = string_sprintf("%s;\n\t%s\n", received, timestamp);
received_header->type = htype_received;
}

diff --git a/test/confs/0420 b/test/confs/0420
index a115c72..734b123 100644
--- a/test/confs/0420
+++ b/test/confs/0420
@@ -10,7 +10,7 @@ qualify_domain = test.ex

 queue_only
 acl_smtp_rcpt = accept
-acl_smtp_data =    accept logwrite = h: <$h_Received:>
+acl_smtp_data =    accept logwrite = ${quote:h: <$h_Received:>}


received_header_text = ${if eq{$sender_address}{x@y}{}{Received: some text}}

diff --git a/test/log/0420 b/test/log/0420
index d7b5c44..ae4dfda 100644
--- a/test/log/0420
+++ b/test/log/0420
@@ -1,7 +1,7 @@

 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-1999-03-02 09:44:33 10HmaX-0005vi-00 h: <>
+1999-03-02 09:44:33 10HmaX-0005vi-00 "h: <>"
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(client.test.ex) [127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 h: <some text; Tue, 2 Mar 1999 09:44:33 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 "h: <some text;\n    Tue, 2 Mar 1999 09:44:33 +0000>"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= a@b H=(client.test.ex) [127.0.0.1] P=smtp S=sss
diff --git a/test/log/5100 b/test/log/5100
index 5c4f5ce..86c3864 100644
--- a/test/log/5100
+++ b/test/log/5100
@@ -71,7 +71,8 @@ DATA
 .
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<     (envelope-from <CALLER@???>)
-<<<     id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<<     id 10HmbD-0005vi-00;
+<<<     Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 05
 <<< Message-Id: <E10HmbD-0005vi-00@???>
 <<< From: CALLER_NAME <CALLER@???>
@@ -128,7 +129,8 @@ DATA
 .
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<     (envelope-from <CALLER@???>)
-<<<     id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<<     id 10HmbF-0005vi-00;
+<<<     Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 06
 <<< Message-Id: <E10HmbF-0005vi-00@???>
 <<< From: CALLER_NAME <CALLER@???>
@@ -201,7 +203,8 @@ DATA
 .
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<     (envelope-from <CALLER@???>)
-<<<     id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<<     id 10HmbI-0005vi-00;
+<<<     Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 08
 <<< Message-Id: <E10HmbI-0005vi-00@???>
 <<< From: CALLER_NAME <CALLER@???>
@@ -239,7 +242,8 @@ DATA
 .
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<     (envelope-from <CALLER@???>)
-<<<     id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<<     id 10HmbJ-0005vi-00;
+<<<     Tue, 2 Mar 1999 09:44:33 +0000
 <<< script: 09
 <<< Message-Id: <E10HmbJ-0005vi-00@???>
 <<< From: CALLER_NAME <CALLER@???>
diff --git a/test/log/5101 b/test/log/5101
index 5c1ba43..ab1ba38 100644
--- a/test/log/5101
+++ b/test/log/5101
@@ -22,7 +22,8 @@ DATA
 .
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<     (envelope-from <CALLER@???>)
-<<<     id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<<     id 10HmaX-0005vi-00;
+<<<     Tue, 2 Mar 1999 09:44:33 +0000
 <<< mailbox: copied
 <<< Message-Id: <E10HmaX-0005vi-00@???>
 <<< From: CALLER_NAME <CALLER@???>
@@ -68,7 +69,8 @@ DATA
 .
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<     (envelope-from <CALLER@???>)
-<<<     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@???>
 <<< From: CALLER_NAME <CALLER@???>
 <<< Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index 1b73cc3..cde2b58 100644
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -5,14 +5,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00.a-b-c-@???>
 From: someone@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
-X-message-linecount: 11
+X-message-linecount: 12
 X-received-count: 1


 This is a test message.
@@ -26,7 +27,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second
 Message-Id: <E10HmaY-0005vi-00.a-b-c-@???>
 From: someone@???
@@ -34,7 +36,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 10
+X-message-linecount: 11
 X-received-count: 1


 This is a second test message.
@@ -46,7 +48,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third
 Reply-to: some@body
 Message-Id: <E10HmaZ-0005vi-00.a-b-c-@???>
@@ -55,7 +58,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 11
+X-message-linecount: 12
 X-received-count: 1


 This is a third test message.
diff --git a/test/mail/0006.CALLER b/test/mail/0006.CALLER
index 627bc16..56065ec 100644
--- a/test/mail/0006.CALLER
+++ b/test/mail/0006.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
-    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaZ-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From:<someone@???>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
@@ -14,7 +15,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message Headers:
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
-    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaZ-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From:<someone@???>
 To: Recipients not given:;
 X-Test: (???? ?? ?????)
@@ -24,7 +26,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 Raw Message Headers:
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
-    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaZ-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From:<someone@???>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
diff --git a/test/mail/0008.CALLER b/test/mail/0008.CALLER
index 0a54f1f..68dcdad 100644
--- a/test/mail/0008.CALLER
+++ b/test/mail/0008.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@???
 To: CALLER@???
 Subject: testing
diff --git a/test/mail/0009.CALLER b/test/mail/0009.CALLER
index b4806a1..48615d5 100644
--- a/test/mail/0009.CALLER
+++ b/test/mail/0009.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@???
 To: CALLER@???
 Subject: testing
diff --git a/test/mail/0010.CALLER b/test/mail/0010.CALLER
index b4806a1..48615d5 100644
--- a/test/mail/0010.CALLER
+++ b/test/mail/0010.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@???
 To: CALLER@???
 Subject: testing
diff --git a/test/mail/0011.CALLER b/test/mail/0011.CALLER
index b4806a1..48615d5 100644
--- a/test/mail/0011.CALLER
+++ b/test/mail/0011.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@???
 To: CALLER@???
 Subject: testing
diff --git a/test/mail/0014.userx b/test/mail/0014.userx
index 8844387..49dd995 100644
--- a/test/mail/0014.userx
+++ b/test/mail/0014.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: aaa@bbb
 To: userx@???, 1=x@???
 Message-Id: <E10HmaX-0005vi-00@???>
@@ -12,7 +13,8 @@ From J.Caesar@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <J.Caesar@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: J.Caesar@???
 To: userx@???, J.Caesar@???,
   J.Calendar@???,
diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index e01024b..4853cf7 100644
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: page+userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -46,7 +47,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for page+userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for page+userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -61,7 +63,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: page+userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -104,7 +107,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for page+ux@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for page+ux@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 870f580..7bedcda 100644
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for page+userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for page+userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -21,7 +22,8 @@ Envelope-to: userx@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -42,7 +44,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for page+ux@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for page+ux@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -58,7 +61,8 @@ Envelope-to: userx@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???
 In-Reply-To: <E10HmbA-0005vi-00@???>
 References: <E10HmbA-0005vi-00@???>
@@ -81,7 +85,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for B+userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for B+userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -99,7 +104,8 @@ Envelope-to: userx-B@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -116,7 +122,8 @@ Envelope-to: X+userx-B@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 5889f68..c670525 100644
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx+page@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx+page@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -21,7 +22,8 @@ Envelope-to: userx@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0021.CALLER b/test/mail/0021.CALLER
index cac7613..e5cb553 100644
--- a/test/mail/0021.CALLER
+++ b/test/mail/0021.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbM-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 2691df4..18e5793 100644
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
+    for ok@test2;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: ok@test2
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@test2>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: ok@test2
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -30,7 +32,8 @@ Test message 3.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
+    for ok@test4;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: ok@test4
@@ -49,7 +52,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@test4>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: ok@test4
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index ee2f5a8..791bbc6 100644
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@test1;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: userx@test1
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <userx@test1>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -31,7 +33,8 @@ From ok@test1 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@test1>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +45,8 @@ From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@test3>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +56,8 @@ Test message 4.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbJ-0005vi-00
-    for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@test1;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: userx@test1
@@ -69,7 +74,8 @@ checks incoming messages on this system. The following error was given:
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbK-0005vi-00
-    for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@test1;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: userx@test1
@@ -89,7 +95,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <userx@test1>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0021.x b/test/mail/0021.x
index 8e8b125..ea2d7a4 100644
--- a/test/mail/0021.x
+++ b/test/mail/0021.x
@@ -3,7 +3,8 @@ Received: from [10.9.8.8] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <ok@test3>)
     id 10HmbI-0005vi-00
-    for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@y;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: added header line


 Some message
@@ -13,7 +14,8 @@ Received: from [10.9.8.8] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <ok@test3>)
     id 10HmbL-0005vi-00
-    for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@y;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-ACL-Warn: added header line


 Some message
diff --git a/test/mail/0023.cond- b/test/mail/0023.cond-
index 84b3bd6..da5322b 100644
--- a/test/mail/0023.cond-
+++ b/test/mail/0023.cond-
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbF-0005vi-00
-    for cond-@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond--1 b/test/mail/0023.cond--1
index ef08691..334186f 100644
--- a/test/mail/0023.cond--1
+++ b/test/mail/0023.cond--1
@@ -3,7 +3,8 @@ Received: from [56.56.57.57] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbL-0005vi-00
-    for cond--1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond--1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond-0 b/test/mail/0023.cond-0
index 578a30f..8b99af1 100644
--- a/test/mail/0023.cond-0
+++ b/test/mail/0023.cond-0
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbH-0005vi-00
-    for cond-0@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-0@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond-00 b/test/mail/0023.cond-00
index 5a8732d..c848706 100644
--- a/test/mail/0023.cond-00
+++ b/test/mail/0023.cond-00
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbI-0005vi-00
-    for cond-00@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-00@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond-1 b/test/mail/0023.cond-1
index cd51692..d5ebc36 100644
--- a/test/mail/0023.cond-1
+++ b/test/mail/0023.cond-1
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbB-0005vi-00
-    for cond-1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-1
 X-message-body-size: 0


diff --git a/test/mail/0023.cond-10 b/test/mail/0023.cond-10
index 62731a3..7bc0533 100644
--- a/test/mail/0023.cond-10
+++ b/test/mail/0023.cond-10
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbC-0005vi-00
-    for cond-10@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-10@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-10
 X-message-body-size: 0


diff --git a/test/mail/0023.cond-false b/test/mail/0023.cond-false
index 6811809..05fdd3f 100644
--- a/test/mail/0023.cond-false
+++ b/test/mail/0023.cond-false
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbJ-0005vi-00
-    for cond-false@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-false@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond-no b/test/mail/0023.cond-no
index f544bb8..eb22c8e 100644
--- a/test/mail/0023.cond-no
+++ b/test/mail/0023.cond-no
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbG-0005vi-00
-    for cond-no@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-no@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond-rhubarb b/test/mail/0023.cond-rhubarb
index 798c40f..030ca9d 100644
--- a/test/mail/0023.cond-rhubarb
+++ b/test/mail/0023.cond-rhubarb
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbE-0005vi-00
-    for cond-rhubarb@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-rhubarb@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



@@ -12,7 +13,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbM-0005vi-00
-    for cond-rhubarb@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-rhubarb@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.cond-true b/test/mail/0023.cond-true
index 5bd91d3..7e82414 100644
--- a/test/mail/0023.cond-true
+++ b/test/mail/0023.cond-true
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbD-0005vi-00
-    for cond-true@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-true@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-true
 X-message-body-size: 0


diff --git a/test/mail/0023.cond-yes b/test/mail/0023.cond-yes
index 94fb12a..967ff7c 100644
--- a/test/mail/0023.cond-yes
+++ b/test/mail/0023.cond-yes
@@ -3,7 +3,8 @@ Received: from [56.56.56.56] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbA-0005vi-00
-    for cond-yes@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-yes@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warn: cond-yes
 X-message-body-size: 0


@@ -13,7 +14,8 @@ Received: from [56.56.57.57] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbK-0005vi-00
-    for cond-yes@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for cond-yes@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-message-body-size: 0



diff --git a/test/mail/0023.okbatch b/test/mail/0023.okbatch
index 16b2f73..700461c 100644
--- a/test/mail/0023.okbatch
+++ b/test/mail/0023.okbatch
@@ -5,7 +5,8 @@ Envelope-to: ok1@???,
 Received: from [56.56.58.58] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <rcpttest@???>)
-    id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbN-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 xx: rcpt_count = 1
     rcpt_defer_count = 0
     rcpt_fail_count  = 0
diff --git a/test/mail/0023.userx b/test/mail/0023.userx
index f97a3f9..02a958b 100644
--- a/test/mail/0023.userx
+++ b/test/mail/0023.userx
@@ -3,7 +3,8 @@ Received: from [32.32.32.32] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Start: domain=test.ex local_part=userx
 Vr: domain=test.ex local_part=userx
 X-message-body-size: 28
@@ -15,7 +16,8 @@ Received: from [55.55.55.55] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-rcpt-added: An added header at RCPT time
 X-data-added: Header added at data time
 X-message-body-size: 24
diff --git a/test/mail/0023.userx-vs b/test/mail/0023.userx-vs
index dc81864..d5e8cd1 100644
--- a/test/mail/0023.userx-vs
+++ b/test/mail/0023.userx-vs
@@ -3,7 +3,8 @@ Received: from [32.32.32.32] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx-vs@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx-vs@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Start: domain=test.ex local_part=userx-vs
 Vs: domain=test.ex local_part=userx-vs
 Vr: domain=test.ex local_part=userx-vs
diff --git a/test/mail/0024.postmaster b/test/mail/0024.postmaster
index e438fc3..ea1c5d5 100644
--- a/test/mail/0024.postmaster
+++ b/test/mail/0024.postmaster
@@ -3,7 +3,8 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmaX-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000


Message 1

@@ -11,7 +12,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [V4NET.0.0.0] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000


Message 2

@@ -20,7 +22,8 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbA-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000


Message 4

@@ -28,7 +31,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [V4NET.11.12.16] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
-    id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbB-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.16 is in a black list at rbl2.test.ex (127.0.0.2)


 Message 5
diff --git a/test/mail/0024.userx b/test/mail/0024.userx
index 7775103..d4b2247 100644
--- a/test/mail/0024.userx
+++ b/test/mail/0024.userx
@@ -2,7 +2,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [V4NET.0.0.0] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000


Message 2

@@ -10,7 +11,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [V4NET.11.12.16] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <userx@???>)
-    id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbB-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.16 is in a black list at rbl2.test.ex (127.0.0.2)


 Message 5
diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index 791683a..a845d2d 100644
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 67c1c08..21b9abc 100644
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -2,7 +2,8 @@ From x@y Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ From x@y Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
 Message-Id: <E10HmbG-0005vi-00@???>
@@ -27,7 +29,8 @@ Message 10
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     id 10HmbH-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@???
diff --git a/test/mail/0031.CALLER b/test/mail/0031.CALLER
index d996dc0..ab6a3ec 100644
--- a/test/mail/0031.CALLER
+++ b/test/mail/0031.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 3551d57..ef3e2dd 100644
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@???>
@@ -43,7 +44,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0036.abcd b/test/mail/0036.abcd
index 1c95038..affc03f 100644
--- a/test/mail/0036.abcd
+++ b/test/mail/0036.abcd
@@ -2,10 +2,12 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???, abcd@???
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0036.userx b/test/mail/0036.userx
index 1c95038..affc03f 100644
--- a/test/mail/0036.userx
+++ b/test/mail/0036.userx
@@ -2,10 +2,12 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???, abcd@???
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 7555bd6..cd2df0d 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@???,
   abcd@???,
   userx@???
@@ -56,7 +57,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should fail this
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -73,7 +75,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@???>
@@ -91,7 +94,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-pipe@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -130,7 +134,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for filter-pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (1)
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -146,7 +151,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-file@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -185,7 +191,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for filter-file@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-file@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (2)
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -201,7 +208,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbJ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-lookup@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -240,7 +248,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for filter-lookup@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-lookup@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (3)
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -256,7 +265,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbL-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-exists@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -295,7 +305,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbK-0005vi-00
-    for filter-exists@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-exists@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (4)
 Message-Id: <E10HmbK-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -311,7 +322,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbN-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-readfile@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -350,7 +362,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbM-0005vi-00
-    for filter-readfile@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-readfile@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (5)
 Message-Id: <E10HmbM-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -366,7 +379,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbP-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-run@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -405,7 +419,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbO-0005vi-00
-    for filter-run@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-run@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (6)
 Message-Id: <E10HmbO-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -421,7 +436,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbR-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 Subject: On vacation
 In-Reply-To: <E10HmbQ-0005vi-00@???>
@@ -439,7 +455,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbT-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 Subject: On vacation
 In-Reply-To: <E10HmbS-0005vi-00@???>
@@ -457,7 +474,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: readfile@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -496,7 +514,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbW-0005vi-00
-    for readfile@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for readfile@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbW-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -512,7 +531,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmcD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter-stat@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -551,7 +571,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmcC-0005vi-00
-    for filter-stat@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-stat@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should give filter error (7)
 Message-Id: <E10HmcC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -567,7 +588,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmcF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 Subject: Re: Very long ... xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 In-Reply-To: <E10HmcE-0005vi-00@???>
diff --git a/test/mail/0037.dff b/test/mail/0037.dff
index 1a07545..ec5e93f 100644
--- a/test/mail/0037.dff
+++ b/test/mail/0037.dff
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbY-0005vi-00
-    for deliverfromfilter@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for deliverfromfilter@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0037.postmaster b/test/mail/0037.postmaster
index 0a789cf..bb3dfd9 100644
--- a/test/mail/0037.postmaster
+++ b/test/mail/0037.postmaster
@@ -4,7 +4,8 @@ Envelope-to: postmaster@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -28,7 +29,8 @@ Envelope-to: postmaster@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbV-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
diff --git a/test/mail/0037.userx b/test/mail/0037.userx
index d216919..37c53d2 100644
--- a/test/mail/0037.userx
+++ b/test/mail/0037.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test 1
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -20,7 +21,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -36,7 +38,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -53,7 +56,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbU-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbU-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -70,7 +74,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbZ-0005vi-00
-    for filter-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0037.userz b/test/mail/0037.userz
index 9aafa6f..d6a2da9 100644
--- a/test/mail/0037.userz
+++ b/test/mail/0037.userz
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test 1
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -19,7 +20,8 @@ Envelope-to: system-filter
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should fail this
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -35,7 +37,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -51,7 +54,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -67,7 +71,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbU-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should freeze this
 Message-Id: <E10HmbU-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -83,7 +88,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbW-0005vi-00
-    for readfile@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for readfile@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbW-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -98,7 +104,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmcA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: should defer this
 Message-Id: <E10HmcA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0040.userx b/test/mail/0040.userx
index 35eb5b5..1bc03d8 100644
--- a/test/mail/0040.userx
+++ b/test/mail/0040.userx
@@ -6,7 +6,8 @@ Received: from forum.rome ([1.1.1.1] ident=jc44bc)
     by the.local.host.name with latin (Exim x.yz)
     (envelope-from <jc@rome>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-interface: 2.2.2.2


 This is a test message.
@@ -18,7 +19,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from jc44bc by the.local.host.name with local (Exim x.yz)
     (envelope-from <jc@rome>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: Julius Caesar <jc@rome>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index f457b84..36cdf8e 100644
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -62,7 +63,8 @@ USER=pipe
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -87,7 +89,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -102,7 +105,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: prefixed+pipe@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -160,7 +164,8 @@ USER=pipe
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for prefixed+pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for prefixed+pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -185,7 +190,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for prefixed+pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for prefixed+pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -200,7 +206,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe-suffixed@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -258,7 +265,8 @@ USER=pipe
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for pipe-suffixed@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe-suffixed@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -283,7 +291,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for pipe-suffixed@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe-suffixed@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -298,7 +307,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: prefixed+pipe-suffixed@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -356,7 +366,8 @@ USER=pipe
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for prefixed+pipe-suffixed@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for prefixed+pipe-suffixed@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -381,7 +392,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for prefixed+pipe-suffixed@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for prefixed+pipe-suffixed@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -396,7 +408,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbG-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -454,7 +467,8 @@ USER=pipe
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -479,7 +493,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index c6e4b19..cb34fea 100644
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -33,7 +35,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -47,7 +50,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -61,7 +65,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -75,7 +80,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@???>
 Message-Id: <E10HmbC-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -90,7 +96,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@???>
 Message-Id: <E10HmbD-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -105,7 +112,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@???>
 Message-Id: <E10HmbE-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -120,7 +128,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@???>
 Message-Id: <E10HmbF-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -135,7 +144,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@???>
 Message-Id: <E10HmbG-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index 4d209dc..bcc824b 100644
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -20,7 +21,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmaY-0005vi-00@???>
 From: userx@???
@@ -35,7 +37,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: userx@???
@@ -50,7 +53,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmbA-0005vi-00@???>
 From: userx@???
@@ -65,7 +69,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmbB-0005vi-00@???>
 From: userx@???
@@ -80,7 +85,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbC-0005vi-00@???>
@@ -95,7 +101,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbD-0005vi-00@???>
@@ -110,7 +117,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: From person <from@???>
 Message-Id: <E10HmbE-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -124,7 +132,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbF-0005vi-00@???>
@@ -139,7 +148,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbG-0005vi-00@???>
@@ -154,7 +164,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbH-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbH-0005vi-00@???>
diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index d7931d7..040163e 100644
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -43,7 +44,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -58,7 +60,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -97,7 +100,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -112,7 +116,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -151,7 +156,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -166,7 +172,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmbG-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -205,7 +212,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0051.userx b/test/mail/0051.userx
index 7e0caa9..473dc3d 100644
--- a/test/mail/0051.userx
+++ b/test/mail/0051.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -33,7 +35,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -47,7 +50,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0052.!one b/test/mail/0052.!one
index 9e4c914..930765c 100644
--- a/test/mail/0052.!one
+++ b/test/mail/0052.!one
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for !one@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for !one@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0052.CALLER b/test/mail/0052.CALLER
index 3a2ee93..427027f 100644
--- a/test/mail/0052.CALLER
+++ b/test/mail/0052.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: xx99@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -43,7 +44,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for xx99@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for xx99@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -58,7 +60,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: !two@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -97,7 +100,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for !two@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for !two@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0052.yy99 b/test/mail/0052.yy99
index 1ebddcb..9f0e376 100644
--- a/test/mail/0052.yy99
+++ b/test/mail/0052.yy99
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for yy99@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for yy99@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0055.userx b/test/mail/0055.userx
index d31bc4a..0ef68b4 100644
--- a/test/mail/0055.userx
+++ b/test/mail/0055.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0072.CALLER b/test/mail/0072.CALLER
index 5199f67..6111525 100644
--- a/test/mail/0072.CALLER
+++ b/test/mail/0072.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmbA-0005vi-00@???>
 References: <E10HmbA-0005vi-00@???>
@@ -37,7 +39,8 @@ Test auto reply to third message
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third message
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -51,7 +54,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmbC-0005vi-00@???>
 References: <E10HmbC-0005vi-00@???>
@@ -72,7 +76,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmbE-0005vi-00@???>
 References: <E10HmbE-0005vi-00@???>
@@ -88,7 +93,8 @@ Test auto reply to third message
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third message
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -101,7 +107,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= <CALLER@???>
 In-Reply-To: <E10HmbG-0005vi-00@???>
 References: <E10HmbG-0005vi-00@???>
diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 45eac6b..36a0d78 100644
--- a/test/mail/0073.CALLER
+++ b/test/mail/0073.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmbA-0005vi-00@???>
 References: <E10HmbA-0005vi-00@???>
diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index 667c731..7862129 100644
--- a/test/mail/0074.CALLER
+++ b/test/mail/0074.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmbA-0005vi-00@???>
 References: <E10HmbA-0005vi-00@???>
diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index fb5be8a..8f75c9e 100644
--- a/test/mail/0074.userx
+++ b/test/mail/0074.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second message
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -33,7 +35,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: third message
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -47,7 +50,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: fourth message
 X-nltest: xxxx
 Message-Id: <E10HmbC-0005vi-00@???>
@@ -60,7 +64,8 @@ Return-path: <>
 Envelope-to: userx@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
-    id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbD-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???,  abey seedy <abcd@???>
 In-Reply-To: <E10HmbC-0005vi-00@???>
 References: <E10HmbC-0005vi-00@???>
@@ -78,7 +83,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: fifth message
 Reply-to: userx@???,
   abcd@???
@@ -92,7 +98,8 @@ Return-path: <>
 Envelope-to: userx@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
-    id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbF-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???,   abcd@???
 In-Reply-To: <E10HmbE-0005vi-00@???>
 References: <E10HmbE-0005vi-00@???>
diff --git a/test/mail/0075.subdir/userx b/test/mail/0075.subdir/userx
index 40bcd43..8484826 100644
--- a/test/mail/0075.subdir/userx
+++ b/test/mail/0075.subdir/userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0079.rbl b/test/mail/0079.rbl
index 27f7889..3e66d66 100644
--- a/test/mail/0079.rbl
+++ b/test/mail/0079.rbl
@@ -3,7 +3,8 @@ Received: from [V4NET.11.12.13] (helo=exim.test.ex ident=CALLER)
     by the.local.host.name with esmtp (Exim x.yz)
     (envelope-from <postmaster@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex


 test message data
@@ -13,7 +14,8 @@ Received: from [V4NET.11.12.14] (helo=exim.test.ex ident=CALLER)
     by the.local.host.name with esmtp (Exim x.yz)
     (envelope-from <postmaster@???>)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex


diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 7a5b523..7587d5f 100644
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -6,7 +6,8 @@ Received: from [V4NET.11.12.13] (helo=exim.test.ex ident=CALLER)
     by the.local.host.name with esmtp (Exim x.yz)
     (envelope-from <postmaster@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is blacklisted at rbl.test.ex


 test message data
@@ -19,7 +20,8 @@ Received: from [V4NET.11.12.14] (helo=exim.test.ex ident=CALLER)
     by the.local.host.name with esmtp (Exim x.yz)
     (envelope-from <postmaster@???>)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.14 is blacklisted at rbl.test.ex
 X-Warning: V4NET.11.12.14 is blacklisted at rbl2.test.ex


@@ -32,7 +34,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <postmaster@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 sysmail: yes
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: postmaster@???
@@ -46,7 +49,8 @@ Envelope-to: userx@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???
 In-Reply-To: <E10HmaZ-0005vi-00@???>
 References: <E10HmaZ-0005vi-00@???>
diff --git a/test/mail/0081.userx b/test/mail/0081.userx
index 4f0d895..6deec82 100644
--- a/test/mail/0081.userx
+++ b/test/mail/0081.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-one: This is the first text.
 To: userx@???
 X-one: This is the second text.
diff --git a/test/mail/0082.userx b/test/mail/0082.userx
index 1711662..61540e4 100644
--- a/test/mail/0082.userx
+++ b/test/mail/0082.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with testproto (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 from: me@???
 To: me@???
 Message-Id: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0083.userx b/test/mail/0083.userx
index 994175b..c68c1e7 100644
--- a/test/mail/0083.userx
+++ b/test/mail/0083.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 from: me@???
 To: me@???
 Message-Id: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index 1415667..fc07423 100644
--- a/test/mail/0090.CALLER
+++ b/test/mail/0090.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0094.userx b/test/mail/0094.userx
index 255c120..122fc97 100644
--- a/test/mail/0094.userx
+++ b/test/mail/0094.userx
@@ -3,7 +3,8 @@ Received: from [V4NET.11.12.13] (ident=root)
     by the.local.host.name with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 host_lookup_failed: 1
 host_lookup_deferred: 0


@@ -14,7 +15,8 @@ Received: from [99.99.99.99] (ident=root)
     by the.local.host.name with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 host_lookup_failed: 0
 host_lookup_deferred: 1


@@ -25,7 +27,8 @@ Received: from [V4NET.99.99.96] (ident=root)
     by the.local.host.name with smtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 host_lookup_failed: 0
 host_lookup_deferred: 1


diff --git a/test/mail/0095.userx b/test/mail/0095.userx
index bd5e61c..8f19a38 100644
--- a/test/mail/0095.userx
+++ b/test/mail/0095.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 quota: 0
 threshold: 10
 Message-Id: <E10HmaY-0005vi-00@???>
@@ -26,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 quota: 10K
 threshold: 900
 Message-Id: <E10HmaZ-0005vi-00@???>
@@ -38,7 +41,8 @@ A test message
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From : p@q
 Reply-To: a@b
@@ -53,7 +57,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 quota: 2200
 threshold: 90%
 Message-Id: <E10HmbB-0005vi-00@???>
@@ -65,7 +70,8 @@ This is a test message
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Reply-To: x@y
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -83,7 +89,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -193,7 +200,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0095.userz b/test/mail/0095.userz
index f10b3ea..d25fcb8 100644
--- a/test/mail/0095.userz
+++ b/test/mail/0095.userz
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 threshold: 330
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0095.userz.bounce b/test/mail/0095.userz.bounce
index 840e40f..1379557 100644
--- a/test/mail/0095.userz.bounce
+++ b/test/mail/0095.userz.bounce
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: userz@???
diff --git a/test/mail/0096.userx b/test/mail/0096.userx
index 1dadfc4..c100b8a 100644
--- a/test/mail/0096.userx
+++ b/test/mail/0096.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: First message subject
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-RBL-Warning: A faked up RBL header
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0097.userx b/test/mail/0097.userx
index 1c062a2..93a552a 100644
--- a/test/mail/0097.userx
+++ b/test/mail/0097.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: First message subject
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-RBL-Warning: A faked up RBL header
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index 1804b41..bf763e4 100644
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -56,7 +57,8 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -70,7 +72,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -122,7 +125,8 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -136,7 +140,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -188,7 +193,8 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -202,7 +208,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -249,7 +256,8 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -263,7 +271,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -310,7 +319,8 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -324,7 +334,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbG-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -365,7 +376,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for xxxx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for xxxx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -379,7 +391,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -420,7 +433,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for yyyy@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for yyyy@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -434,7 +448,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbN-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -483,7 +498,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbM-0005vi-00
-    for rrrr@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rrrr@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: testing a remote defer
 Message-Id: <E10HmbM-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0100.CALLER b/test/mail/0100.CALLER
index 49db745..74188f3 100644
--- a/test/mail/0100.CALLER
+++ b/test/mail/0100.CALLER
@@ -5,7 +5,8 @@ Envelope-to: batch-userx@???,
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbK-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbK-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbK-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0100.userw b/test/mail/0100.userw
index 3906e41..22e1343 100644
--- a/test/mail/0100.userw
+++ b/test/mail/0100.userw
@@ -8,7 +8,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userw@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userw@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0100.userx b/test/mail/0100.userx
index 1de79e0..49156a7 100644
--- a/test/mail/0100.userx
+++ b/test/mail/0100.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -25,7 +26,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -167,7 +169,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -309,7 +312,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -451,7 +455,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -467,7 +472,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for filter-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -488,7 +494,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for filter-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -503,7 +510,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -515,7 +523,8 @@ Last line ending without a newline and being a single dot:
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbJ-0005vi-00
-    for mmdf-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for mmdf-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbJ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -531,7 +540,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbL-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: From
 Message-Id: <E10HmbL-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0100.usery b/test/mail/0100.usery
index a7f4709..76c8f9d 100644
--- a/test/mail/0100.usery
+++ b/test/mail/0100.usery
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0100.userz b/test/mail/0100.userz
index 41f2f98..72be2e3 100644
--- a/test/mail/0100.userz
+++ b/test/mail/0100.userz
@@ -7,7 +7,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0101.userx b/test/mail/0101.userx
index 4848398..47f26da 100644
--- a/test/mail/0101.userx
+++ b/test/mail/0101.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -158,7 +160,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -297,7 +300,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -436,7 +440,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -452,7 +457,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for filter-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -473,7 +479,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for filter-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -485,7 +492,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -497,7 +505,8 @@ Last line ending without a newline and being a single dot:
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for mmdf-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for mmdf-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -510,7 +519,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: From
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0101.userz b/test/mail/0101.userz
index a340c34..99702ba 100644
--- a/test/mail/0101.userz
+++ b/test/mail/0101.userz
@@ -7,7 +7,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0102.batched b/test/mail/0102.batched
index 2160dc3..1446b30 100644
--- a/test/mail/0102.batched
+++ b/test/mail/0102.batched
@@ -4,7 +4,8 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for batch-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for batch-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -17,7 +18,8 @@ RCPT TO:<usery@???>
 DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbH-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbH-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0102.userx b/test/mail/0102.userx
index 2b5ed98..9d0e91c 100644
--- a/test/mail/0102.userx
+++ b/test/mail/0102.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0102.usery b/test/mail/0102.usery
index b3cca92..e8a0dd2 100644
--- a/test/mail/0102.usery
+++ b/test/mail/0102.usery
@@ -7,7 +7,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for bsmtp_usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for bsmtp_usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -23,7 +24,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0102.userz b/test/mail/0102.userz
index 2a8c4ad..8badbe9 100644
--- a/test/mail/0102.userz
+++ b/test/mail/0102.userz
@@ -2,7 +2,8 @@
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for mmdf_userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for mmdf_userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ Test message with mmdf_ prefix
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -24,7 +26,8 @@ Second test message, no prefix.
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index afa48bf..0cd4418 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: WASabc@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -41,7 +42,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for "abc@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for "abc@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -53,7 +55,8 @@ Message sent to "abc@???.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: ":fail: fail message"@special
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -92,7 +95,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for ":fail: fail message"@special; Tue, 2 Mar 1999 09:44:33 +0000
+    for ":fail: fail message"@special;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0103.rewritten b/test/mail/0103.rewritten
index c01a105..2ab37d5 100644
--- a/test/mail/0103.rewritten
+++ b/test/mail/0103.rewritten
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for "xyz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for "xyz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0104.mmm b/test/mail/0104.mmm
index bc92557..fce4295 100644
--- a/test/mail/0104.mmm
+++ b/test/mail/0104.mmm
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for mmm@ten-1; Tue, 2 Mar 1999 09:44:33 +0000
+    for mmm@ten-1;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: You <mmm@???>
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0104.yyy b/test/mail/0104.yyy
index 4096709..524d44f 100644
--- a/test/mail/0104.yyy
+++ b/test/mail/0104.yyy
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for yyy@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for yyy@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: comment <yyy@???>
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0105.default b/test/mail/0105.default
index d621863..6597372 100644
--- a/test/mail/0105.default
+++ b/test/mail/0105.default
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0105.firstuser b/test/mail/0105.firstuser
index 98088c7..d5911df 100644
--- a/test/mail/0105.firstuser
+++ b/test/mail/0105.firstuser
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for firstuser@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for firstuser@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0105.seconduser b/test/mail/0105.seconduser
index 90f98df..95768be 100644
--- a/test/mail/0105.seconduser
+++ b/test/mail/0105.seconduser
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for seconduser@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for seconduser@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0110.second b/test/mail/0110.second
index 3f228be..4639054 100644
--- a/test/mail/0110.second
+++ b/test/mail/0110.second
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for first@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for first@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0111.userx b/test/mail/0111.userx
index 9f535da..55931f5 100644
--- a/test/mail/0111.userx
+++ b/test/mail/0111.userx
@@ -3,7 +3,8 @@ Envelope-to: userx@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -16,7 +17,8 @@ Envelope-to: Philip@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for Philip@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for Philip@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -29,7 +31,8 @@ Envelope-to: philip@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for philip@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for philip@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0112.file b/test/mail/0112.file
index 7bc02a7..c6b8495 100644
--- a/test/mail/0112.file
+++ b/test/mail/0112.file
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for file@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for file@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0112.pipe b/test/mail/0112.pipe
index 3f86bc8..365a8d0 100644
--- a/test/mail/0112.pipe
+++ b/test/mail/0112.pipe
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0113.second b/test/mail/0113.second
index 3f228be..4639054 100644
--- a/test/mail/0113.second
+++ b/test/mail/0113.second
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for first@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for first@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0114.file b/test/mail/0114.file
index a04c45d..333eba4 100644
--- a/test/mail/0114.file
+++ b/test/mail/0114.file
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for file@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for file@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -11,7 +12,8 @@ Message to file.


 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: A. File <file@???>, No One <null@???>
 Subject: autoreply
 In-Reply-To: <E10HmaZ-0005vi-00@???>
diff --git a/test/mail/0114.pipe b/test/mail/0114.pipe
index 3f86bc8..365a8d0 100644
--- a/test/mail/0114.pipe
+++ b/test/mail/0114.pipe
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0115.file b/test/mail/0115.file
index cce7503..cddb342 100644
--- a/test/mail/0115.file
+++ b/test/mail/0115.file
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for one-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for one-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -26,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for two-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for two-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -38,7 +41,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for three-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for three-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0116.acopy b/test/mail/0116.acopy
index e9c3e76..5e9b357 100644
--- a/test/mail/0116.acopy
+++ b/test/mail/0116.acopy
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0116.alias1 b/test/mail/0116.alias1
index e9c3e76..5e9b357 100644
--- a/test/mail/0116.alias1
+++ b/test/mail/0116.alias1
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0116.alias2 b/test/mail/0116.alias2
index e9c3e76..5e9b357 100644
--- a/test/mail/0116.alias2
+++ b/test/mail/0116.alias2
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0116.dcopy b/test/mail/0116.dcopy
index d53ee0b..ee483d5 100644
--- a/test/mail/0116.dcopy
+++ b/test/mail/0116.dcopy
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -12,7 +13,8 @@ Message sent to dcopy.
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0118.userx b/test/mail/0118.userx
index e3b8635..81cfe13 100644
--- a/test/mail/0118.userx
+++ b/test/mail/0118.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0127.userx b/test/mail/0127.userx
index 364abef..0f5f186 100644
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -20,7 +21,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -35,7 +37,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -50,7 +53,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -65,7 +69,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -80,7 +85,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbC-0005vi-00@???>
@@ -95,7 +101,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbD-0005vi-00@???>
@@ -110,7 +117,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbE-0005vi-00@???>
@@ -125,7 +133,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbF-0005vi-00@???>
@@ -140,7 +149,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: Sender in original <sender@???>
 From: From person <from@???>
 Message-Id: <E10HmbG-0005vi-00@???>
diff --git a/test/mail/0131.copy b/test/mail/0131.copy
index 798a7af..40c68fb 100644
--- a/test/mail/0131.copy
+++ b/test/mail/0131.copy
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0131.userx b/test/mail/0131.userx
index 85a3958..c2f3a11 100644
--- a/test/mail/0131.userx
+++ b/test/mail/0131.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0133.dddd b/test/mail/0133.dddd
index 98c203b..fd84013 100644
--- a/test/mail/0133.dddd
+++ b/test/mail/0133.dddd
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Envelope-to: userx@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Envelope-to: usery@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0134.UC-USERX b/test/mail/0134.UC-USERX
index 78e8ca8..69685e0 100644
--- a/test/mail/0134.UC-USERX
+++ b/test/mail/0134.UC-USERX
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for USERX@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for USERX@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0134.directfile b/test/mail/0134.directfile
index aa9475d..486a62e 100644
--- a/test/mail/0134.directfile
+++ b/test/mail/0134.directfile
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for direct_file_user@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for direct_file_user@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0134.lc-unknown b/test/mail/0134.lc-unknown
index 4495f88..511bd21 100644
--- a/test/mail/0134.lc-unknown
+++ b/test/mail/0134.lc-unknown
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for unknown@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for unknown@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Test message
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -29,7 +31,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for UNKNOWN@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for UNKNOWN@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0134.lc-userx b/test/mail/0134.lc-userx
index 0d8a3c8..53e6375 100644
--- a/test/mail/0134.lc-userx
+++ b/test/mail/0134.lc-userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Test message
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -29,7 +31,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +45,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 16e7a18..2fb7c15 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for forwarder@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for forwarder@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -44,7 +45,8 @@ Content-type: message/rfc822
 Return-path: <abcd@???>
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <abcd@???>)
-    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@???>
 From: abcd@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -56,7 +58,8 @@ Test message.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for forwarder@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for forwarder@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -99,7 +102,8 @@ Content-type: text/rfc822-headers
 Return-path: <abcd@???>
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <abcd@???>)
-    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@???>
 From: abcd@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0137.userx b/test/mail/0137.userx
index cfcf6e2..9fb813a 100644
--- a/test/mail/0137.userx
+++ b/test/mail/0137.userx
@@ -2,7 +2,8 @@ From t1@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <t1@foo>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: First
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <t1@foo>
@@ -16,7 +17,8 @@ From t1@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <t1@foo>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Second
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <t1@foo>
@@ -30,7 +32,8 @@ From t2@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <t2@foo>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Third
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <t2@foo>
@@ -44,7 +47,8 @@ From t3@foo Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <t3@foo>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Fourth
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <t3@foo>
diff --git a/test/mail/0139.userx b/test/mail/0139.userx
index cf8d04b..0bd4941 100644
--- a/test/mail/0139.userx
+++ b/test/mail/0139.userx
@@ -6,7 +6,8 @@ Received: from [V4NET.11.12.22] (ident=CALLER)
     by the.local.host.name with smtp (Exim x.yz)
     (envelope-from <postmaster@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DNSlist: rbl4.test.ex This is a test blacklisting4 message V4NET.11.12.22
 DNSlist: rbl5.test.ex This is a test blacklisting5 message V4NET.11.12.22


diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index 7a53cce..2e62f78 100644
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: Reply Person <CALLER@???>
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -22,7 +23,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: reply2@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -60,7 +62,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for reply2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for reply2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message; non-printer >?<
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER
index f7938eb..0627eb6 100644
--- a/test/mail/0142.CALLER
+++ b/test/mail/0142.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -47,7 +48,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0142.filter b/test/mail/0142.filter
index 7dca981..37919a8 100644
--- a/test/mail/0142.filter
+++ b/test/mail/0142.filter
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0150.postmaster b/test/mail/0150.postmaster
index eb51b1c..d95d9ab 100644
--- a/test/mail/0150.postmaster
+++ b/test/mail/0150.postmaster
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: not.the.login@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0151.postmaster b/test/mail/0151.postmaster
index 58f860c..9b0eabe 100644
--- a/test/mail/0151.postmaster
+++ b/test/mail/0151.postmaster
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: not.the.login@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0152.postmaster b/test/mail/0152.postmaster
index 2e23156..d182cf1 100644
--- a/test/mail/0152.postmaster
+++ b/test/mail/0152.postmaster
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: not.the.login@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: page+CALLER@???
 Message-Id: <E10HmaY-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -25,7 +27,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: call+CALLER@???
 Message-Id: <E10HmaZ-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -37,7 +40,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: call-CALLER@???
 Message-Id: <E10HmbA-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -48,7 +52,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: CALLER&page@???
 Message-Id: <E10HmbB-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -59,7 +64,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: CALLER&call@???
 Message-Id: <E10HmbC-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -71,7 +77,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: CALLER=call@???
 Message-Id: <E10HmbD-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -82,7 +89,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: page+CALLER=call@???
 Message-Id: <E10HmbE-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0159.userx b/test/mail/0159.userx
index e03f9d0..90f907d 100644
--- a/test/mail/0159.userx
+++ b/test/mail/0159.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO [ip4.ip4.ip4.ip4]
@@ -11,7 +12,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO [IPV4:ip4.ip4.ip4.ip4]
@@ -20,7 +22,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4] (helo=ip4.ip4.ip4.ip4)
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO ip4.ip4.ip4.ip4
@@ -29,7 +32,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4] (helo=[V4NET.1.2.3])
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO [V4NET.1.2.3]
diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 2561035..3bfb359 100644
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -60,7 +61,8 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -84,7 +86,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -95,7 +98,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -153,7 +157,8 @@ USER=system-filter

>From CALLER@??? Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -176,7 +181,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 13bf30b..8c5e67b 100644
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -60,7 +61,8 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -84,7 +86,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -95,7 +98,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -155,7 +159,8 @@ USER=system-filter

>From CALLER@??? Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -178,7 +183,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0166.userx b/test/mail/0166.userx
index d076309..b7862d4 100644
--- a/test/mail/0166.userx
+++ b/test/mail/0166.userx
@@ -3,7 +3,8 @@ Envelope-to: a@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0166.usery b/test/mail/0166.usery
index 8076ae6..74cb2b7 100644
--- a/test/mail/0166.usery
+++ b/test/mail/0166.usery
@@ -3,7 +3,8 @@ Envelope-to: a@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0167.userx b/test/mail/0167.userx
index c5ac0af..d9f8762 100644
--- a/test/mail/0167.userx
+++ b/test/mail/0167.userx
@@ -4,7 +4,8 @@ Envelope-to: userx@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Return-path: <>
 Envelope-to: userx@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: remove@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -27,7 +29,8 @@ Envelope-to: userx@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <trakill@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: trakill@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0169.userx b/test/mail/0169.userx
index 34ff7fc..325e274 100644
--- a/test/mail/0169.userx
+++ b/test/mail/0169.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 quota: 0
 threshold: 10
 Message-Id: <E10HmaY-0005vi-00@???>
@@ -26,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 quota: 50M
 threshold: 41%
 Message-Id: <E10HmbA-0005vi-00@???>
diff --git a/test/mail/0171.CALLER b/test/mail/0171.CALLER
index 74a6567..80019b0 100644
--- a/test/mail/0171.CALLER
+++ b/test/mail/0171.CALLER
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0173.userx b/test/mail/0173.userx
index e544833..8169ade 100644
--- a/test/mail/0173.userx
+++ b/test/mail/0173.userx
@@ -2,11 +2,13 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -17,10 +19,12 @@ Test message
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0173.usery b/test/mail/0173.usery
index f7da5ec..38706b8 100644
--- a/test/mail/0173.usery
+++ b/test/mail/0173.usery
@@ -1,10 +1,12 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0173.userz b/test/mail/0173.userz
index f7da5ec..38706b8 100644
--- a/test/mail/0173.userz
+++ b/test/mail/0173.userz
@@ -1,10 +1,12 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index 8df0614..c55713f 100644
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,10 +40,12 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbC-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0174.userx b/test/mail/0174.userx
index 8ef0afb..54d1a53 100644
--- a/test/mail/0174.userx
+++ b/test/mail/0174.userx
@@ -2,11 +2,13 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -16,10 +18,12 @@ Test message
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -29,10 +33,12 @@ Another test message
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbC-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0174.usery b/test/mail/0174.usery
index e4bfa8a..6554fde 100644
--- a/test/mail/0174.usery
+++ b/test/mail/0174.usery
@@ -1,10 +1,12 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0174.userz b/test/mail/0174.userz
index e4bfa8a..6554fde 100644
--- a/test/mail/0174.userz
+++ b/test/mail/0174.userz
@@ -1,10 +1,12 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER
index 1cc0d54..37ba89d 100644
--- a/test/mail/0176.CALLER
+++ b/test/mail/0176.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: someone@somewhere
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,7 +40,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for someone@somewhere; Tue, 2 Mar 1999 09:44:33 +0000
+    for someone@somewhere;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index 30bddca..c6019ec 100644
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: fail this
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0177.userx b/test/mail/0177.userx
index b1c6670..7062d80 100644
--- a/test/mail/0177.userx
+++ b/test/mail/0177.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: reply to this
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this (1)
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -26,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this (2)
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 2fc9e36..4e913a4 100644
--- a/test/mail/0177.usery
+++ b/test/mail/0177.usery
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@???
 Subject: auto fail message
 In-Reply-To: <E10HmaX-0005vi-00@???>
@@ -16,7 +17,8 @@ failing userx@???
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@???
 Subject: auto freeze message
 In-Reply-To: <E10HmbA-0005vi-00@???>
@@ -31,7 +33,8 @@ freezing userx@???
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@???
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@???>
@@ -46,7 +49,8 @@ This is a text line
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@???
 Subject: auto freeze message
 In-Reply-To: <E10HmbE-0005vi-00@???>
@@ -61,7 +65,8 @@ freezing userx@???
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: usery@???
 Subject: auto freeze message
 In-Reply-To: <E10HmbG-0005vi-00@???>
diff --git a/test/mail/0182.userx b/test/mail/0182.userx
index 3c666c6..48fdc6e 100644
--- a/test/mail/0182.userx
+++ b/test/mail/0182.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0189.userx b/test/mail/0189.userx
index eda035d..f182ad5 100644
--- a/test/mail/0189.userx
+++ b/test/mail/0189.userx
@@ -4,7 +4,8 @@ Envelope-to: userx@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -17,7 +18,8 @@ Envelope-to: userx@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     (envelope-from <root@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@???
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <root@???>
diff --git a/test/mail/0192.userx b/test/mail/0192.userx
index a55a9bb..b585bb9 100644
--- a/test/mail/0192.userx
+++ b/test/mail/0192.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: "Phil Q. Hazel" <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: =?ISO-8859-1?Q?M=E8=E9_spaces=3A_funny=2C_char=5Facters?= <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER
index 79944e6..bbef20e 100644
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@???,
   usery@???,
   userx@???
@@ -58,7 +59,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -70,7 +72,8 @@ This is a test message.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: seven@???,
   six@???,
   five@???,
@@ -161,7 +164,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -173,7 +177,8 @@ Here's another message.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@???,
   usery@???,
   userx@???
@@ -233,7 +238,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbC-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ret: 99
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 49eeb21..164bedd 100644
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -4,7 +4,8 @@ RCPT TO:<usery@???>
 DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -17,7 +18,8 @@ RCPT TO:<y@???>
 DATA
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <doesn't@matter>)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: doesn't@matter
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index b3d6cfe..3d5baab 100644
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 .: this is legal
 From: me@???
 Message-Id: <E10HmaX-0005vi-00@???>
@@ -16,7 +17,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: me@???
 Message-Id: <E10HmaY-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -29,7 +31,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: me@???
 ..: this really is legal
 Message-Id: <E10HmaZ-0005vi-00@???>
@@ -44,7 +47,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: me@???
 ..: this really is legal
 Message-Id: <E10HmbA-0005vi-00@???>
diff --git a/test/mail/0205.redirected b/test/mail/0205.redirected
index 889ceb2..820b7df 100644
--- a/test/mail/0205.redirected
+++ b/test/mail/0205.redirected
@@ -2,7 +2,8 @@ From postmaster@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for redirect@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for redirect@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0205.x b/test/mail/0205.x
index cabaaf1..1d747a9 100644
--- a/test/mail/0205.x
+++ b/test/mail/0205.x
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0210.file b/test/mail/0210.file
index feb1225..ec36393 100644
--- a/test/mail/0210.file
+++ b/test/mail/0210.file
@@ -6,7 +6,8 @@ Return-path: <>
 Envelope-to: file@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0210.pipe b/test/mail/0210.pipe
index 4d976d6..5081629 100644
--- a/test/mail/0210.pipe
+++ b/test/mail/0210.pipe
@@ -5,7 +5,8 @@ Return-path: <>
 Envelope-to: pipe@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index 1501b91..99c3539 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -45,7 +46,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -58,7 +60,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
@@ -111,7 +114,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 0eadbaa..4b893ff 100644
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -2,7 +2,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <foo@bar>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@???>
@@ -13,7 +14,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <foo@bar>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@???>
@@ -24,7 +26,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <foo@bar>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@???>
@@ -35,7 +38,8 @@ From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <foo@bar>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: foobydooby <foo@bar>
 Message-Id: <E10HmbB-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -46,7 +50,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0221.userx b/test/mail/0221.userx
index b13a7d7..35f5435 100644
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -12,7 +13,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -22,7 +24,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -32,7 +35,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: foobydooby <foo@bar>
 Message-Id: <E10HmbB-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1
index 6db0b20..bbdd7ab 100644
--- a/test/mail/0222.foo1
+++ b/test/mail/0222.foo1
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for foo1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for foo1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@???
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -15,7 +16,8 @@ Auto reply message
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for foo1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for foo1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: foo1@???
 In-Reply-To: <E10HmbG-0005vi-00@???>
 References: <E10HmbG-0005vi-00@???>
diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index a932aa0..8b4a9b1 100644
--- a/test/mail/0222.foo2
+++ b/test/mail/0222.foo2
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for foo2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for foo2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: foo2@???
 In-Reply-To: <E10HmbA-0005vi-00@???>
 References: <E10HmbA-0005vi-00@???>
diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 5747305..068677a 100644
--- a/test/mail/0222.foo3
+++ b/test/mail/0222.foo3
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for foo3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for foo3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: foo3@???
 In-Reply-To: <E10HmbD-0005vi-00@???>
 References: <E10HmbD-0005vi-00@???>
diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 45eac6b..36a0d78 100644
--- a/test/mail/0223.CALLER
+++ b/test/mail/0223.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
@@ -21,7 +22,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmbA-0005vi-00@???>
 References: <E10HmbA-0005vi-00@???>
diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index ee6af38..651d237 100644
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: bounce@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -49,7 +50,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: first message
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -64,7 +66,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -124,7 +127,8 @@ Content-type: text/rfc822-headers
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaZ-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second message
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index e8425b6..fd1e8d7 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe1@???,
   file1@???
 Auto-Submitted: auto-replied
@@ -46,7 +47,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -58,7 +60,8 @@ Message 1
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: pipe2@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -115,7 +118,8 @@ USER=pipe2

>From CALLER@??? Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -139,7 +143,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0226.file b/test/mail/0226.file
index 27c3caf..96b080e 100644
--- a/test/mail/0226.file
+++ b/test/mail/0226.file
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0230.x b/test/mail/0230.x
index 6027b25..bef6df0 100644
--- a/test/mail/0230.x
+++ b/test/mail/0230.x
@@ -3,7 +3,8 @@ Received: from [ip4.ip4.ip4.ip4] (port=1113)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@???>)
     id 10HmaY-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1113



@@ -12,7 +13,8 @@ Received: from [127.0.0.1] (port=1114)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@???>)
     id 10HmaZ-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1114



@@ -21,7 +23,8 @@ Received: from [ip4.ip4.ip4.ip4] (port=1115 helo=rhubarb)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@???>)
     id 10HmbA-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1115



@@ -30,7 +33,8 @@ Received: from [V4NET.9.8.7] (port=1111 ident=root)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@???>)
     id 10HmaX-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Port: 1111


 -oMa message
diff --git a/test/mail/0231.a b/test/mail/0231.a
index e83069f..78f1acb 100644
--- a/test/mail/0231.a
+++ b/test/mail/0231.a
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From:     a-rewrite@???, b@???, a@domain1, b@domain1, a@domain3, b@domain3
 To:       a-rewrite@???, b@???, a@domain1, b@domain1, a@domain3, b@domain3
 Reply-to: a-rewrite@???, b@???, a@domain1, b@domain1, a@domain3, b@domain3
diff --git a/test/mail/0231.b b/test/mail/0231.b
index ef29f5f..6c2677d 100644
--- a/test/mail/0231.b
+++ b/test/mail/0231.b
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???, b@???, a@domain1, b@domain1, a@domain3, b@domain3
 To:       a@???, b@???, a@domain1, b@domain1, a@domain3, b@domain3
 Reply-to: a@???, b@???, a@domain1, b@domain1, a@domain3, b@domain3
diff --git a/test/mail/0233.me b/test/mail/0233.me
index 2efa358..0554055 100644
--- a/test/mail/0233.me
+++ b/test/mail/0233.me
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for me@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for me@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: me@???
@@ -20,7 +21,8 @@ The following address(es) have yet to be delivered:
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for me@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for me@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: me@???
@@ -35,7 +37,8 @@ The sender is <CALLER@???>.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for me@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for me@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: me@???
diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster
index 6c0b1ff..987bdd6 100644
--- a/test/mail/0233.postmaster
+++ b/test/mail/0233.postmaster
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: postmaster@???
 Subject: System filter has frozen
 In-Reply-To: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 6b607c2..66ed382 100644
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -44,7 +45,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -56,7 +58,8 @@ Message 1
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -112,7 +115,8 @@ USER=pipe2

>From CALLER@??? Tue Mar 02 09:44:33 1999

 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -136,7 +140,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0237.file b/test/mail/0237.file
index 27c3caf..96b080e 100644
--- a/test/mail/0237.file
+++ b/test/mail/0237.file
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0240.subdir/userx b/test/mail/0240.subdir/userx
index e3b8635..81cfe13 100644
--- a/test/mail/0240.subdir/userx
+++ b/test/mail/0240.subdir/userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0241.userx b/test/mail/0241.userx
index e3b8635..81cfe13 100644
--- a/test/mail/0241.userx
+++ b/test/mail/0241.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0243.CALLER b/test/mail/0243.CALLER
index 11fc708..6be4af4 100644
--- a/test/mail/0243.CALLER
+++ b/test/mail/0243.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: local.part@???
 Reply-To: x@y, 
  p@q
diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER
index 8f9e514..8b64f22 100644
--- a/test/mail/0246.CALLER
+++ b/test/mail/0246.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER_NAME <CALLER@???>
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0252.t1 b/test/mail/0252.t1
index c81584d..2cb4252 100644
--- a/test/mail/0252.t1
+++ b/test/mail/0252.t1
@@ -3,7 +3,8 @@ Return-path: <postmaster@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <abc@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: abc@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Return-path: <postmaster@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <pqr@???>)
     id 10HmaY-0005vi-00
-    for alias@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for alias@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: pqr@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -27,7 +29,8 @@ Return-path: <postmaster@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <gfh@???>)
     id 10HmaZ-0005vi-00
-    for forward@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for forward@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: gfh@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -39,7 +42,8 @@ Return-path: <postmaster@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <mno@???>)
     id 10HmbA-0005vi-00
-    for smart@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for smart@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: mno@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0252.t2 b/test/mail/0252.t2
index 557cf27..4d3c34c 100644
--- a/test/mail/0252.t2
+++ b/test/mail/0252.t2
@@ -3,7 +3,8 @@ Return-path: <abc@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <abc@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: abc@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Return-path: <alias@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <pqr@???>)
     id 10HmaY-0005vi-00
-    for alias@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for alias@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: pqr@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -27,7 +29,8 @@ Return-path: <forward@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <gfh@???>)
     id 10HmaZ-0005vi-00
-    for forward@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for forward@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: gfh@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -39,7 +42,8 @@ Return-path: <smart@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <mno@???>)
     id 10HmbA-0005vi-00
-    for smart@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for smart@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: mno@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index 09ce0e9..0f90140 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for lmn@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for lmn@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fail@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -47,7 +48,8 @@ Content-type: message/rfc822
 Return-path: <pqr@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <pqr@???>)
-    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@???>
 From: pqr@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0253.t1 b/test/mail/0253.t1
index 89e645f..a5bac9c 100644
--- a/test/mail/0253.t1
+++ b/test/mail/0253.t1
@@ -4,7 +4,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <abc@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: abc@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0253.t2 b/test/mail/0253.t2
index 7a64b8c..648b1c3 100644
--- a/test/mail/0253.t2
+++ b/test/mail/0253.t2
@@ -4,7 +4,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <xyz@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: xyz@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER
index 0cf46b1..95da946 100644
--- a/test/mail/0256.CALLER
+++ b/test/mail/0256.CALLER
@@ -1,6 +1,7 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,7 +40,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for unknown@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for unknown@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 996f8d0..80a36c3 100644
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -1,6 +1,7 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,7 +40,8 @@ Return-path: <"abc@???>
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <"abc@???>)
     id 10HmaZ-0005vi-00
-    for unknown@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for unknown@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: "abc@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0256.abcd+test.ex+xxxx b/test/mail/0256.abcd+test.ex+xxxx
index 0cf46b1..95da946 100644
--- a/test/mail/0256.abcd+test.ex+xxxx
+++ b/test/mail/0256.abcd+test.ex+xxxx
@@ -1,6 +1,7 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,7 +40,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for unknown@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for unknown@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git "a/test/mail/0256.abcd+unknown.domain+\"abc@def\"" "b/test/mail/0256.abcd+unknown.domain+\"abc@def\""
index 996f8d0..80a36c3 100644
--- "a/test/mail/0256.abcd+unknown.domain+\"abc@def\""
+++ "b/test/mail/0256.abcd+unknown.domain+\"abc@def\""
@@ -1,6 +1,7 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: unknown@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,7 +40,8 @@ Return-path: <"abc@???>
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <"abc@???>)
     id 10HmaZ-0005vi-00
-    for unknown@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for unknown@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: "abc@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0258.userx b/test/mail/0258.userx
index 75ac314..1cc37c5 100644
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 crheader: includes <

> and ends CRLF

 Subject: this is still a header
@@ -22,7 +23,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 crheader: includes <

> and ends CRLF

 Message-Id: <E10HmaY-0005vi-00@???>
@@ -42,7 +44,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 crheader: includes <

> and ends CRLF

 Message-Id: <E10HmaZ-0005vi-00@???>
@@ -61,7 +64,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -73,7 +77,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -84,7 +89,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -96,7 +102,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -107,7 +114,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 .dotheader: header line starts with a dot
 xxx: dot bare CR:.
  xyz
@@ -123,7 +131,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: contains CR<

> in the subject

 Message-Id: <E10HmbF-0005vi-00@???>
@@ -139,7 +148,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: contains CR<

> in the subject

 Message-Id: <E10HmbG-0005vi-00@???>
diff --git a/test/mail/0260.userx b/test/mail/0260.userx
index c620db5..38cacf6 100644
--- a/test/mail/0260.userx
+++ b/test/mail/0260.userx
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.CALLER b/test/mail/0266.CALLER
index 144bf01..01e8196 100644
--- a/test/mail/0266.CALLER
+++ b/test/mail/0266.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: CALLER@???
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nmlist@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -41,7 +42,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for nmlist@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nmlist@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.filter b/test/mail/0266.filter
index 137fab1..246a40b 100644
--- a/test/mail/0266.filter
+++ b/test/mail/0266.filter
@@ -4,7 +4,8 @@ Envelope-to: filter@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for filter@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.filter2 b/test/mail/0266.filter2
index 443ca18..3fad77f 100644
--- a/test/mail/0266.filter2
+++ b/test/mail/0266.filter2
@@ -4,7 +4,8 @@ Envelope-to: filter2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for filter2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.filter3 b/test/mail/0266.filter3
index 62ddce1..7cff0f5 100644
--- a/test/mail/0266.filter3
+++ b/test/mail/0266.filter3
@@ -4,7 +4,8 @@ Envelope-to: filter3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for filter3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.list2 b/test/mail/0266.list2
index 7b7dd14..e9258c2 100644
--- a/test/mail/0266.list2
+++ b/test/mail/0266.list2
@@ -4,7 +4,8 @@ Envelope-to: list2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for list2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.postmaster b/test/mail/0266.postmaster
index 9abd0cc..068b070 100644
--- a/test/mail/0266.postmaster
+++ b/test/mail/0266.postmaster
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -24,7 +25,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -45,7 +47,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -68,7 +71,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -89,7 +93,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -112,7 +117,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbJ-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
diff --git a/test/mail/0266.spqr b/test/mail/0266.spqr
index 6c1c436..a0dab11 100644
--- a/test/mail/0266.spqr
+++ b/test/mail/0266.spqr
@@ -4,7 +4,8 @@ Envelope-to: list@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for list@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0266.userx b/test/mail/0266.userx
index 6c1c436..a0dab11 100644
--- a/test/mail/0266.userx
+++ b/test/mail/0266.userx
@@ -4,7 +4,8 @@ Envelope-to: list@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for list@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.CALLER b/test/mail/0270.CALLER
index 144bf01..01e8196 100644
--- a/test/mail/0270.CALLER
+++ b/test/mail/0270.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: CALLER@???
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nmlist@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -41,7 +42,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for nmlist@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nmlist@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.filter b/test/mail/0270.filter
index 137fab1..246a40b 100644
--- a/test/mail/0270.filter
+++ b/test/mail/0270.filter
@@ -4,7 +4,8 @@ Envelope-to: filter@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for filter@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.filter2 b/test/mail/0270.filter2
index 443ca18..3fad77f 100644
--- a/test/mail/0270.filter2
+++ b/test/mail/0270.filter2
@@ -4,7 +4,8 @@ Envelope-to: filter2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for filter2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.filter3 b/test/mail/0270.filter3
index 62ddce1..7cff0f5 100644
--- a/test/mail/0270.filter3
+++ b/test/mail/0270.filter3
@@ -4,7 +4,8 @@ Envelope-to: filter3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for filter3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.list2 b/test/mail/0270.list2
index 7b7dd14..e9258c2 100644
--- a/test/mail/0270.list2
+++ b/test/mail/0270.list2
@@ -4,7 +4,8 @@ Envelope-to: list2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for list2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.postmaster b/test/mail/0270.postmaster
index 18ad82c..c466262 100644
--- a/test/mail/0270.postmaster
+++ b/test/mail/0270.postmaster
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -24,7 +25,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -45,7 +47,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -68,7 +71,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -89,7 +93,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
@@ -112,7 +117,8 @@ Return-path: <>
 Envelope-to: postmaster@???
 Received: from root by myhost.test.ex with local (Exim x.yz)
     id 10HmbJ-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
diff --git a/test/mail/0270.spqr b/test/mail/0270.spqr
index 6c1c436..a0dab11 100644
--- a/test/mail/0270.spqr
+++ b/test/mail/0270.spqr
@@ -4,7 +4,8 @@ Envelope-to: list@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for list@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0270.userx b/test/mail/0270.userx
index 6c1c436..a0dab11 100644
--- a/test/mail/0270.userx
+++ b/test/mail/0270.userx
@@ -4,7 +4,8 @@ Envelope-to: list@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for list@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0274.abcd b/test/mail/0274.abcd
index c620db5..38cacf6 100644
--- a/test/mail/0274.abcd
+++ b/test/mail/0274.abcd
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0274.redirect b/test/mail/0274.redirect
index c620db5..38cacf6 100644
--- a/test/mail/0274.redirect
+++ b/test/mail/0274.redirect
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0274.userx b/test/mail/0274.userx
index c620db5..38cacf6 100644
--- a/test/mail/0274.userx
+++ b/test/mail/0274.userx
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0274.xyz b/test/mail/0274.xyz
index c620db5..38cacf6 100644
--- a/test/mail/0274.xyz
+++ b/test/mail/0274.xyz
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0280.CALLER b/test/mail/0280.CALLER
index 1029f14..da6b63a 100644
--- a/test/mail/0280.CALLER
+++ b/test/mail/0280.CALLER
@@ -1,6 +1,7 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: spqr@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -39,7 +40,8 @@ Return-path: <spqr@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <spqr@???>)
     id 10HmaX-0005vi-00
-    for spqr@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for spqr@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: spqr@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -49,7 +51,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000


 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: abcd@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -88,7 +91,8 @@ Return-path: <abcd@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <abcd@???>)
     id 10HmaZ-0005vi-00
-    for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abcd@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: abcd@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0282.userx b/test/mail/0282.userx
index abd61fa..9f085dd 100644
--- a/test/mail/0282.userx
+++ b/test/mail/0282.userx
@@ -3,7 +3,8 @@ Received: from [127.0.0.1] (port=1111 helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 interface-port: 1225
 received-port:  1225


@@ -14,7 +15,8 @@ Received: from [127.0.0.1] (port=1112 helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 interface-port: 1226
 received-port:  1226


diff --git a/test/mail/0283.CALLER b/test/mail/0283.CALLER
index 4169dc5..f074668 100644
--- a/test/mail/0283.CALLER
+++ b/test/mail/0283.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: somebody@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -45,7 +46,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for somebody@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for somebody@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0284.batched b/test/mail/0284.batched
index 51d20fb..7664bb8 100644
--- a/test/mail/0284.batched
+++ b/test/mail/0284.batched
@@ -3,7 +3,8 @@ Envelope-to: x-t1@???,
  y-t1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: x-t4@???,
  xx-t4@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -25,7 +27,8 @@ Envelope-to: y-t4@???,
  yy-t4@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0284.other.domain b/test/mail/0284.other.domain
index 0d5a674..a4cdada 100644
--- a/test/mail/0284.other.domain
+++ b/test/mail/0284.other.domain
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Envelope-to: z-t3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0284.test.ex b/test/mail/0284.test.ex
index c0c5be9..6d625cf 100644
--- a/test/mail/0284.test.ex
+++ b/test/mail/0284.test.ex
@@ -3,7 +3,8 @@ Envelope-to: x-t3@???,
  y-t3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0284.x-t2 b/test/mail/0284.x-t2
index 685deb4..c916dbb 100644
--- a/test/mail/0284.x-t2
+++ b/test/mail/0284.x-t2
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Envelope-to: x-t2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0284.y-t2 b/test/mail/0284.y-t2
index a2c4531..c390cc5 100644
--- a/test/mail/0284.y-t2
+++ b/test/mail/0284.y-t2
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Envelope-to: y-t2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0289.CALLER b/test/mail/0289.CALLER
index 6768501..fd1dc12 100644
--- a/test/mail/0289.CALLER
+++ b/test/mail/0289.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index 7451024..5858faf 100644
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: failure@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for failure@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for failure@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER
index b3ee1e8..8851e6b 100644
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: failure1@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -41,7 +42,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for failure1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for failure1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +54,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: failure2@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -91,7 +94,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for failure2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for failure2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0306.anyone b/test/mail/0306.anyone
index 01aae7f..c0623e8 100644
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+    for anyone@anywhere;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: list1@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <anyone@anywhere>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <anyone@anywhere>)
     id 10HmaZ-0005vi-00
-    for list1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: anyone@anywhere
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -51,7 +53,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+    for anyone@anywhere;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nonlist@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -90,7 +93,8 @@ Return-path: <anyone@anywhere>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <anyone@anywhere>)
     id 10HmbB-0005vi-00
-    for nonlist@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nonlist@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: anyone@anywhere
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index 01aae7f..c0623e8 100644
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+    for anyone@anywhere;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: list1@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <anyone@anywhere>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <anyone@anywhere>)
     id 10HmaZ-0005vi-00
-    for list1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: anyone@anywhere
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -51,7 +53,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
+    for anyone@anywhere;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nonlist@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -90,7 +93,8 @@ Return-path: <anyone@anywhere>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <anyone@anywhere>)
     id 10HmbB-0005vi-00
-    for nonlist@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nonlist@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: anyone@anywhere
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER
index 42a6041..32243c9 100644
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: 1k@???,
   55@???,
   50@???
@@ -50,7 +51,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0310.CALLER b/test/mail/0310.CALLER
index 2be400b..7fcde23 100644
--- a/test/mail/0310.CALLER
+++ b/test/mail/0310.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: abcd@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abcd@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0318.subdir/userx b/test/mail/0318.subdir/userx
index 6f77ef9..52fe829 100644
--- a/test/mail/0318.subdir/userx
+++ b/test/mail/0318.subdir/userx
@@ -1,7 +1,8 @@
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0319.saved b/test/mail/0319.saved
index d23681e..e363618 100644
--- a/test/mail/0319.saved
+++ b/test/mail/0319.saved
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 subject: file
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER
index 891b20b..db1bd9b 100644
--- a/test/mail/0321.CALLER
+++ b/test/mail/0321.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for |/bin/cat\ /etc/aliases\ @test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+    for |/bin/cat\ /etc/aliases\ @test.ex;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0324.userx b/test/mail/0324.userx
index b83389d..229b7d0 100644
--- a/test/mail/0324.userx
+++ b/test/mail/0324.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/test/mail/0326.userx b/test/mail/0326.userx
index 2beaf0d..3721930 100644
--- a/test/mail/0326.userx
+++ b/test/mail/0326.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for pppp-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pppp-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx+ssss@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx+ssss@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -26,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0327.userx b/test/mail/0327.userx
index 78566bd..8b5293f 100644
--- a/test/mail/0327.userx
+++ b/test/mail/0327.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -12,7 +13,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0328.userx b/test/mail/0328.userx
index c000ee1..37a3b2a 100644
--- a/test/mail/0328.userx
+++ b/test/mail/0328.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0329.userx b/test/mail/0329.userx
index c000ee1..37a3b2a 100644
--- a/test/mail/0329.userx
+++ b/test/mail/0329.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0330.userz1 b/test/mail/0330.userz1
index 0c6f019..efcde11 100644
--- a/test/mail/0330.userz1
+++ b/test/mail/0330.userz1
@@ -3,7 +3,8 @@ Envelope-to: userx@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Remove: This header should go
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -15,7 +16,8 @@ Envelope-to: UserY@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for UserY@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for UserY@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Remove: This header should go
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -27,7 +29,8 @@ Envelope-to: usery@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Remove: This header should go
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0335.batch b/test/mail/0335.batch
index 9af2408..4dea42b 100644
--- a/test/mail/0335.batch
+++ b/test/mail/0335.batch
@@ -3,7 +3,8 @@ Envelope-to: batch@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for batch@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for batch@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0335.clone b/test/mail/0335.clone
index 9f5ca6e..3391d9d 100644
--- a/test/mail/0335.clone
+++ b/test/mail/0335.clone
@@ -6,7 +6,8 @@ Envelope-to: clone@???,
  c2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0335.final b/test/mail/0335.final
index ce7ba65..331cb2d 100644
--- a/test/mail/0335.final
+++ b/test/mail/0335.final
@@ -3,7 +3,8 @@ Envelope-to: onelevel2@???,
  onelevel1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: top2@???,
  top1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -27,7 +29,8 @@ Envelope-to: onelevel2@???,
  top1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0338.a1-userx b/test/mail/0338.a1-userx
index 8aaf5e4..9d16263 100644
--- a/test/mail/0338.a1-userx
+++ b/test/mail/0338.a1-userx
@@ -3,7 +3,8 @@ Return-path: <postmaster@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0338.a2-userx b/test/mail/0338.a2-userx
index 8aaf5e4..9d16263 100644
--- a/test/mail/0338.a2-userx
+++ b/test/mail/0338.a2-userx
@@ -3,7 +3,8 @@ Return-path: <postmaster@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0341.mailbox b/test/mail/0341.mailbox
index e02fff8..5ae00dd 100644
--- a/test/mail/0341.mailbox
+++ b/test/mail/0341.mailbox
@@ -3,7 +3,8 @@ Envelope-to: userx@???,
  usery@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0346.x b/test/mail/0346.x
index af1c480..53a69a8 100644
--- a/test/mail/0346.x
+++ b/test/mail/0346.x
@@ -3,7 +3,8 @@ Envelope-to: x@dom1,
  x@dom2
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0349.xxxx b/test/mail/0349.xxxx
index 8d9e1de..5689bd3 100644
--- a/test/mail/0349.xxxx
+++ b/test/mail/0349.xxxx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0351.userx b/test/mail/0351.userx
index 41b34c0..87205f7 100644
--- a/test/mail/0351.userx
+++ b/test/mail/0351.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Resent-Message-Id: <E10HmaX-0005vi-00@???>
 To: userx@???
@@ -37,7 +38,8 @@ two
 ALL: Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Resent-Message-Id: <E10HmaX-0005vi-00@???>
 To: userx@???
diff --git a/test/mail/0352.userx b/test/mail/0352.userx
index 4b16d19..aa464cf 100644
--- a/test/mail/0352.userx
+++ b/test/mail/0352.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From:                      
 To:                         
 Message-Id: <E10HmaX-0005vi-00@???>
@@ -18,7 +19,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: abcd@???
 To:         
 To: xyz@???
@@ -38,7 +40,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To:         
 To: abcd@???
 To: xyz@???
@@ -58,7 +61,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: abcd@???
 To: xyz@???
 To: pqr@???
diff --git a/test/mail/0359.userx b/test/mail/0359.userx
index 67eae78..89d4c9a 100644
--- a/test/mail/0359.userx
+++ b/test/mail/0359.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 15131c9..02dac6c 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: CALLER@???
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: d3@???,
   b1@???
 Auto-Submitted: auto-replied
@@ -52,7 +53,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.a1 b/test/mail/0374.a1
index 7f05c69..6a13384 100644
--- a/test/mail/0374.a1
+++ b/test/mail/0374.a1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: a1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.a1-u b/test/mail/0374.a1-u
index 7f05c69..6a13384 100644
--- a/test/mail/0374.a1-u
+++ b/test/mail/0374.a1-u
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: a1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.b1 b/test/mail/0374.b1
index 0828f89..5c83444 100644
--- a/test/mail/0374.b1
+++ b/test/mail/0374.b1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: b1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.c1 b/test/mail/0374.c1
index 34b259b..4bd219c 100644
--- a/test/mail/0374.c1
+++ b/test/mail/0374.c1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: c1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.d1 b/test/mail/0374.d1
index f8f550a..114ddf0 100644
--- a/test/mail/0374.d1
+++ b/test/mail/0374.d1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: d1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.d2 b/test/mail/0374.d2
index 10a2fd8..69412e6 100644
--- a/test/mail/0374.d2
+++ b/test/mail/0374.d2
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: d2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0374.d3 b/test/mail/0374.d3
index bf4454b..05ff4c6 100644
--- a/test/mail/0374.d3
+++ b/test/mail/0374.d3
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: d3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index 9dc76c9..c2f6cc1 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: CALLER@???
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: e1@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -45,7 +46,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.a1 b/test/mail/0375.a1
index 7f05c69..6a13384 100644
--- a/test/mail/0375.a1
+++ b/test/mail/0375.a1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: a1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.a1-u b/test/mail/0375.a1-u
index 031e92c..ba0e749 100644
--- a/test/mail/0375.a1-u
+++ b/test/mail/0375.a1-u
@@ -3,7 +3,8 @@ Return-path: <>
 Envelope-to: a1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.b1 b/test/mail/0375.b1
index 0828f89..5c83444 100644
--- a/test/mail/0375.b1
+++ b/test/mail/0375.b1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: b1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.c1 b/test/mail/0375.c1
index 34b259b..4bd219c 100644
--- a/test/mail/0375.c1
+++ b/test/mail/0375.c1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: c1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.d1 b/test/mail/0375.d1
index f8f550a..114ddf0 100644
--- a/test/mail/0375.d1
+++ b/test/mail/0375.d1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: d1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.d2 b/test/mail/0375.d2
index 10a2fd8..69412e6 100644
--- a/test/mail/0375.d2
+++ b/test/mail/0375.d2
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: d2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.d3 b/test/mail/0375.d3
index bf4454b..05ff4c6 100644
--- a/test/mail/0375.d3
+++ b/test/mail/0375.d3
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: d3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.e1 b/test/mail/0375.e1
index 207f5a3..2e66957 100644
--- a/test/mail/0375.e1
+++ b/test/mail/0375.e1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: e1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.f1 b/test/mail/0375.f1
index 91e6b31..02836f0 100644
--- a/test/mail/0375.f1
+++ b/test/mail/0375.f1
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: f1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.f2 b/test/mail/0375.f2
index c0f59bf..8f49d3d 100644
--- a/test/mail/0375.f2
+++ b/test/mail/0375.f2
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: f2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.f3 b/test/mail/0375.f3
index 96c0c3e..64b53ea 100644
--- a/test/mail/0375.f3
+++ b/test/mail/0375.f3
@@ -3,7 +3,8 @@ Return-path: <CALLER@???>
 Envelope-to: f3@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.h1 b/test/mail/0375.h1
index 7e0faae..fd31f0d 100644
--- a/test/mail/0375.h1
+++ b/test/mail/0375.h1
@@ -4,7 +4,8 @@ Envelope-to: h1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for h1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for h1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0375.h1-u b/test/mail/0375.h1-u
index 7e0faae..fd31f0d 100644
--- a/test/mail/0375.h1-u
+++ b/test/mail/0375.h1-u
@@ -4,7 +4,8 @@ Envelope-to: h1@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for h1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for h1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0377.aaaa b/test/mail/0377.aaaa
index 872481d..b5e250f 100644
--- a/test/mail/0377.aaaa
+++ b/test/mail/0377.aaaa
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0377.bbbb b/test/mail/0377.bbbb
index 872481d..b5e250f 100644
--- a/test/mail/0377.bbbb
+++ b/test/mail/0377.bbbb
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0377.cccc b/test/mail/0377.cccc
index 872481d..b5e250f 100644
--- a/test/mail/0377.cccc
+++ b/test/mail/0377.cccc
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0378.file b/test/mail/0378.file
index 71b909d..889d8d5 100644
--- a/test/mail/0378.file
+++ b/test/mail/0378.file
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for aaaa@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for aaaa@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0379.bbbb b/test/mail/0379.bbbb
index 872481d..b5e250f 100644
--- a/test/mail/0379.bbbb
+++ b/test/mail/0379.bbbb
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0379.cccc b/test/mail/0379.cccc
index 872481d..b5e250f 100644
--- a/test/mail/0379.cccc
+++ b/test/mail/0379.cccc
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0380.bbbb b/test/mail/0380.bbbb
index 872481d..b5e250f 100644
--- a/test/mail/0380.bbbb
+++ b/test/mail/0380.bbbb
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0383.CALLER b/test/mail/0383.CALLER
index 8177417..2e62b06 100644
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -61,7 +62,8 @@ USER=system-filter
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for alice@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for alice@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: alice@???
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -86,7 +88,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for alice@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for alice@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: alice@???
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -98,7 +101,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -157,7 +161,8 @@ USER=system-filter
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for jabberwocky@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for jabberwocky@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: jabberwocky@???
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -182,7 +187,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for jabberwocky@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for jabberwocky@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: jabberwocky@???
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -194,7 +200,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: redking@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -254,7 +261,8 @@ USER=redking
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for redking@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for redking@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: redking@???
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -279,7 +287,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for redking@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for redking@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: redking@???
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index 8f4f15a..9ed1a0c 100644
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: body size = 2
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -53,7 +55,8 @@ X
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -92,7 +95,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: body size = 200
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -108,7 +112,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -147,7 +152,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: body size = 1600
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -191,7 +197,8 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -230,7 +237,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0386.2 b/test/mail/0386.2
index d320a67..79c2eea 100644
--- a/test/mail/0386.2
+++ b/test/mail/0386.2
@@ -3,7 +3,8 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmaX-0005vi-00
-    for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+    for 2@b;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message


@@ -14,7 +15,8 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
     by myhost.test.ex with smtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmaY-0005vi-00
-    for 2@b; Tue, 2 Mar 1999 09:44:33 +0000
+    for 2@b;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
 X-Warning: This is a test blacklisting message


diff --git a/test/mail/0393.userx b/test/mail/0393.userx
index 24ab3d6..52949d4 100644
--- a/test/mail/0393.userx
+++ b/test/mail/0393.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -24,7 +26,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0395.CALLER b/test/mail/0395.CALLER
index 55c623f..ca59cb3 100644
--- a/test/mail/0395.CALLER
+++ b/test/mail/0395.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 5c7e799..69b311e 100644
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: philip
 To: userx
 Message-Id: <E10HmaY-0005vi-00@???>
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@???
 To: userx@???
 Message-Id: <E10HmaZ-0005vi-00@???>
@@ -26,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@???
 To: userx@???
 Message-Id: <E10HmbA-0005vi-00@???>
@@ -38,7 +41,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: philip
 To: userx
 Message-Id: <E10HmbB-0005vi-00@???>
@@ -49,7 +53,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx
 To: userx
 Message-Id: <E10HmbC-0005vi-00@???>
@@ -61,7 +66,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@???
 To: userx@???
 Message-Id: <E10HmbD-0005vi-00@???>
@@ -73,7 +79,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx
 To: userx
 Message-Id: <E10HmbE-0005vi-00@???>
@@ -85,7 +92,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx@???
 To: userx@???
 Message-Id: <E10HmbF-0005vi-00@???>
diff --git a/test/mail/0398.x b/test/mail/0398.x
index 85dde19..081d38b 100644
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for x@local; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@local;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0404.sender b/test/mail/0404.sender
index fd77af8..611ed13 100644
--- a/test/mail/0404.sender
+++ b/test/mail/0404.sender
@@ -1,6 +1,7 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???,  sender@???, sender@???, sender@???, sender@???
 In-Reply-To: <E10HmaX-0005vi-00@???>
 References: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0408.userx b/test/mail/0408.userx
index 159be98..1e4491c 100644
--- a/test/mail/0408.userx
+++ b/test/mail/0408.userx
@@ -2,7 +2,8 @@ From usery@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0411.afolder b/test/mail/0411.afolder
index 96b94a1..0289ce6 100644
--- a/test/mail/0411.afolder
+++ b/test/mail/0411.afolder
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for t1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for t1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -11,7 +12,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0412.CALLER b/test/mail/0412.CALLER
index 410121d..d5c6f6d 100644
--- a/test/mail/0412.CALLER
+++ b/test/mail/0412.CALLER
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: CALLER_NAME <CALLER@???>
 Message-Id: <E10HmaX-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -18,7 +19,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Reply-to:
 From: CALLER_NAME <CALLER@???>
 Message-Id: <E10HmaY-0005vi-00@???>
@@ -35,7 +37,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Reply-to: usery@???
 From: CALLER_NAME <CALLER@???>
 Message-Id: <E10HmaZ-0005vi-00@???>
@@ -52,7 +55,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From:
 Message-Id: <E10HmbA-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0421.a b/test/mail/0421.a
index e8cc113..1a3f0e1 100644
--- a/test/mail/0421.a
+++ b/test/mail/0421.a
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: abc@???
 To: abc@???
 Reply-to: abc@???
diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index dad1f74..7709237 100644
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -4,7 +4,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: restrict-userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -43,7 +44,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for restrict-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for restrict-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Filter: require "fileinto"; fileinto "userx-extra";
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -59,7 +61,8 @@ Envelope-to: CALLER@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: restrict-userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -98,7 +101,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for restrict-userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for restrict-userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Filter: fileinto "userx-extra";
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0428.inbox.JUNK b/test/mail/0428.inbox.JUNK
index 1ccfe98..3f93f62 100644
--- a/test/mail/0428.inbox.JUNK
+++ b/test/mail/0428.inbox.JUNK
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for userx8@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx8@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -25,7 +26,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for userx10@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx10@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99-
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -45,7 +47,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbJ-0005vi-00
-    for userx11@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx11@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: -99
 Message-Id: <E10HmbJ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -65,7 +68,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbK-0005vi-00
-    for userx12@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx12@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: -99
 Message-Id: <E10HmbK-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0428.redirected b/test/mail/0428.redirected
index fc04836..7aceb57 100644
--- a/test/mail/0428.redirected
+++ b/test/mail/0428.redirected
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Filter: redirect "redirected@???";
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0428.someone b/test/mail/0428.someone
index 8939761..6f57e04 100644
--- a/test/mail/0428.someone
+++ b/test/mail/0428.someone
@@ -4,7 +4,8 @@ Envelope-to: someone@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     id 10HmbM-0005vi-00
-    for someone@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for someone@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: userx13@???
 To: someone@???
 Subject: Automated reply
diff --git a/test/mail/0428.userx b/test/mail/0428.userx
index b47f439..600a1db 100644
--- a/test/mail/0428.userx
+++ b/test/mail/0428.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Filter: if true { stop; fileinto "inbox.never"; }
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0428.userx-extra b/test/mail/0428.userx-extra
index d7dc5ae..b62c858 100644
--- a/test/mail/0428.userx-extra
+++ b/test/mail/0428.userx-extra
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Filter: require "fileinto"; fileinto "userx-extra";
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0428.userx-sawsuffix b/test/mail/0428.userx-sawsuffix
index c2a457a..2483f42 100644
--- a/test/mail/0428.userx-sawsuffix
+++ b/test/mail/0428.userx-sawsuffix
@@ -4,7 +4,8 @@ Envelope-to: userx14-suffix@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <someone@???>)
-    id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbN-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbN-0005vi-00@???>
 From: someone@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0428.userx13 b/test/mail/0428.userx13
index 7a70d93..97d6e86 100644
--- a/test/mail/0428.userx13
+++ b/test/mail/0428.userx13
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <someone@???>)
     id 10HmbL-0005vi-00
-    for userx13@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx13@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx13@???
 Message-Id: <E10HmbL-0005vi-00@???>
 From: someone@???
diff --git a/test/mail/0428.userx14 b/test/mail/0428.userx14
index 0c542a7..d80030f 100644
--- a/test/mail/0428.userx14
+++ b/test/mail/0428.userx14
@@ -4,7 +4,8 @@ Envelope-to: userx14-suffix2@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <someone@???>)
-    id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbN-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbN-0005vi-00@???>
 From: someone@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0428.userx9 b/test/mail/0428.userx9
index 1cfb156..927e614 100644
--- a/test/mail/0428.userx9
+++ b/test/mail/0428.userx9
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for userx9@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx9@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Sieve: 99
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0431.xxx b/test/mail/0431.xxx
index 263f826..9c302d0 100644
--- a/test/mail/0431.xxx
+++ b/test/mail/0431.xxx
@@ -4,7 +4,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for pre.xxx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pre.xxx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -16,7 +17,8 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for pre.xxx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for pre.xxx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0436.CALLER b/test/mail/0436.CALLER
index 71eedd9..f3bacbe 100644
--- a/test/mail/0436.CALLER
+++ b/test/mail/0436.CALLER
@@ -10,7 +10,8 @@ Envelope-to: a@???,
  d@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0437.file b/test/mail/0437.file
index 4c0dd6c..796aff2 100644
--- a/test/mail/0437.file
+++ b/test/mail/0437.file
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER
index 76b76de..4c17f74 100644
--- a/test/mail/0444.CALLER
+++ b/test/mail/0444.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: Mailer-Daemon@???
 Reply-To: postmaster@???
 To: CALLER@???
@@ -35,7 +36,8 @@ to correct the fault described above.
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0444.userx b/test/mail/0444.userx
index 687b228..2c82672 100644
--- a/test/mail/0444.userx
+++ b/test/mail/0444.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0446.userx b/test/mail/0446.userx
index 4aebdbe..416fabc 100644
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: the first received: line
 Received: the second received: line
 Message-Id: <E10HmaX-0005vi-00@???>
@@ -16,7 +17,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: the first received: line
 Received: the second received: line
 Message-Id: <E10HmaY-0005vi-00@???>
diff --git a/test/mail/0449.userx b/test/mail/0449.userx
index 7976e94..a4e2dd6 100644
--- a/test/mail/0449.userx
+++ b/test/mail/0449.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index a0aac71..d290121 100644
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@???>
@@ -20,7 +21,8 @@ This is some body text
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -59,7 +61,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 fno: 2
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0452.userx b/test/mail/0452.userx
index 385e9ec..2cb003b 100644
--- a/test/mail/0452.userx
+++ b/test/mail/0452.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 fno: 1
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0460.userx b/test/mail/0460.userx
index 7e9d15b..1cdbed5 100644
--- a/test/mail/0460.userx
+++ b/test/mail/0460.userx
@@ -3,7 +3,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: x@y
 To: some@one
 Subject: contains >
@@ -17,7 +18,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: x@y
 Bheader: some text
 To: some@one
diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 0f19a62..543b759 100644
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +54,8 @@ Short message
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -91,7 +94,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -103,7 +107,8 @@ Short message
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -142,7 +147,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0472.userz99 b/test/mail/0472.userz99
index ca8fa0d..fe0e79d 100644
--- a/test/mail/0472.userz99
+++ b/test/mail/0472.userz99
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0480.userx b/test/mail/0480.userx
index 4ab8184..02779e4 100644
--- a/test/mail/0480.userx
+++ b/test/mail/0480.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=foobar)
     by the.local.host.name with smtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-sah: host.127.0.0.1



diff --git a/test/mail/0481.userx b/test/mail/0481.userx
index 4af9fec..bebca96 100644
--- a/test/mail/0481.userx
+++ b/test/mail/0481.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Another: This is another header
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -14,7 +15,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Another: This is another header
 X-Ren-dont:    test globbing
 Message-Id: <E10HmaY-0005vi-00@???>
diff --git a/test/mail/0485.userx b/test/mail/0485.userx
index de28e95..e911fcc 100644
--- a/test/mail/0485.userx
+++ b/test/mail/0485.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [1.2.3.4] (helo=x.y.z ident=CALLER)
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000


This is a test message.

@@ -11,7 +12,8 @@ Received: from [1.2.3.4] (helo=x.y.z ident=CALLER)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <nonnull@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000


This is a test message.

diff --git a/test/mail/0487.userx b/test/mail/0487.userx
index 42d5c11..637fd9c 100644
--- a/test/mail/0487.userx
+++ b/test/mail/0487.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=x.y)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: unqualified
 Message-Id: <E10HmaX-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0491.userx b/test/mail/0491.userx
index d03d186..77d67ce 100644
--- a/test/mail/0491.userx
+++ b/test/mail/0491.userx
@@ -2,7 +2,8 @@ From "abc@??? Tue Mar 02 09:44:33 1999
 Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"abc@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <"abc@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -12,7 +13,8 @@ From a.b@??? Tue Mar 02 09:44:33 1999
 Received: from a.b by myhost.test.ex with local (Exim x.yz)
     (envelope-from <a.b@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <a.b@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -22,7 +24,8 @@ From ".a.b"@??? Tue Mar 02 09:44:33 1999
 Received: from ".a.b" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <".a.b"@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <".a.b"@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -32,7 +35,8 @@ From "a.b."@??? Tue Mar 02 09:44:33 1999
 Received: from "a.b." by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"a.b."@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <"a.b."@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +46,8 @@ From "a\"b"@??? Tue Mar 02 09:44:33 1999
 Received: from "a\"b" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"a\"b"@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <"a\"b"@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +57,8 @@ From "abc@??? Tue Mar 02 09:44:33 1999
 Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"abc@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: x@y
 Message-Id: <E10HmbC-0005vi-00@???>
 Sender: CALLER_NAME <"abc@???>
@@ -63,7 +69,8 @@ From "abc%xyz"@??? Tue Mar 02 09:44:33 1999
 Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"abc%xyz"@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <"abc%xyz"@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0493.a b/test/mail/0493.a
index ad9fcea..31f618e 100644
--- a/test/mail/0493.a
+++ b/test/mail/0493.a
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0494.userx b/test/mail/0494.userx
index 4379cb2..b3551e2 100644
--- a/test/mail/0494.userx
+++ b/test/mail/0494.userx
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???
 Subject: testing, testing
 In-Reply-To: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index 32240fd..c0010e1 100644
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -3,7 +3,8 @@ At-Start: some text
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for someone@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for someone@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 After-Received: some text
 From: some@ne
 To: someone@???
diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index 78312f0..e8882eb 100644
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -2,7 +2,8 @@ From postmaster@y Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <postmaster@y>)
     id 10HmaX-0005vi-00
-    for userx@y; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@y;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: testing
 Message-Id: <E10HmaX-0005vi-00@???>
 From: postmaster@y
diff --git a/test/mail/0503.userx b/test/mail/0503.userx
index afa0a57..53e38b6 100644
--- a/test/mail/0503.userx
+++ b/test/mail/0503.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index 8a069ca..0f3ea3d 100644
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -50,7 +51,8 @@ Content-type: message/rfc822
 Return-path: <>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000


diff --git a/test/mail/0514.userx b/test/mail/0514.userx
index 5f22df6..4f967fe 100644
--- a/test/mail/0514.userx
+++ b/test/mail/0514.userx
@@ -2,7 +2,8 @@ From "spaced user"@??? Tue Mar 02 09:44:33 1999
 Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"spaced user"@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <"spaced user"@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index b9b1a1b..67462d3 100644
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0517.usery b/test/mail/0517.usery
index 79f02e6..3afba6d 100644
--- a/test/mail/0517.usery
+++ b/test/mail/0517.usery
@@ -2,6 +2,7 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000



diff --git a/test/mail/0522.CALLER b/test/mail/0522.CALLER
index 867dea8..972fdfd 100644
--- a/test/mail/0522.CALLER
+++ b/test/mail/0522.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: nofilter@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for nofilter@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nofilter@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -51,7 +53,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: filter@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -90,7 +93,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for filter@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for filter@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0523.userx b/test/mail/0523.userx
index 854cab5..9f16369 100644
--- a/test/mail/0523.userx
+++ b/test/mail/0523.userx
@@ -5,7 +5,8 @@ Envelope-to: four@???,
  one@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0530.CALLER b/test/mail/0530.CALLER
index d073821..9c578bb 100644
--- a/test/mail/0530.CALLER
+++ b/test/mail/0530.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: Message-id, no References, no In-Reply-to
 In-Reply-To: <m1@b>
@@ -16,7 +17,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: Message-id, no References, In-Reply-to
 In-Reply-To: <m1@b>
@@ -31,7 +33,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: Message-id, References (1), In-Reply-to
 In-Reply-To: <m1@b>
@@ -46,7 +49,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbE-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: Message-id, References (5), no In-Reply-to
 In-Reply-To: <m1@b>
@@ -61,7 +65,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbG-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: Message-id, References (15), In-Reply-to
 In-Reply-To: <m1@b>
@@ -76,7 +81,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbI-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: no Message-id, no References, no In-Reply-to
 Auto-Submitted: auto-replied
@@ -89,7 +95,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbK-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: no Message-id, no References, In-Reply-to
 References: <i1@b>
@@ -103,7 +110,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbM-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: no Message-id, References (1), In-Reply-to
 References: <r1@b>
@@ -117,7 +125,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbO-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: no Message-id, References (5), no In-Reply-to
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
@@ -131,7 +140,8 @@ This is the text of the autoreply.
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     id 10HmbQ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: CALLER@???
 Subject: Re: no Message-id, References (15), In-Reply-to
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index fb54ab6..0c7d1ec 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -42,7 +43,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -54,7 +56,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -96,7 +99,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -108,7 +112,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -151,7 +156,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index e669ef7..5411418 100644
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -2,7 +2,8 @@ From mailok@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <mailok@???>)
     id 10HmaX-0005vi-00
-    for rcptok@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rcptok@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 cond: accept
 Message-Id: <E10HmaX-0005vi-00@???>
 From: mailok@???
@@ -27,7 +28,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for rcptok@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rcptok@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0533.mbox b/test/mail/0533.mbox
index 26716f5..8cfd547 100644
--- a/test/mail/0533.mbox
+++ b/test/mail/0533.mbox
@@ -3,7 +3,8 @@ Envelope-to: file-usery=mbox@???,
  file-userx=mbox@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0533.mbox2 b/test/mail/0533.mbox2
index 4d2c754..7005140 100644
--- a/test/mail/0533.mbox2
+++ b/test/mail/0533.mbox2
@@ -3,7 +3,8 @@ Envelope-to: file-usera=mbox2@???,
  file-userz=mbox2@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0535.userx b/test/mail/0535.userx
index e399450..6d4c765 100644
--- a/test/mail/0535.userx
+++ b/test/mail/0535.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ From nofix@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <nofix@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Added: userx@???


 No headers supplied.
@@ -22,7 +24,8 @@ From x@y Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -33,7 +36,8 @@ From nofix@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
     (envelope-from <nofix@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Added: userx@???


 No headers supplied.
diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 8a64908..5fa14e5 100644
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbC-0005vi-00
-    for oksender@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for oksender@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: user22@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <oksender@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <oksender@???>)
     id 10HmbB-0005vi-00
-    for user22@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user22@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: oksender@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0536.user1 b/test/mail/0536.user1
index 7be8501..a123ee8 100644
--- a/test/mail/0536.user1
+++ b/test/mail/0536.user1
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: user1@???
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <user1@???>)
     id 10HmaX-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: user1@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0536.user2 b/test/mail/0536.user2
index 33eb92a..2589ffa 100644
--- a/test/mail/0536.user2
+++ b/test/mail/0536.user2
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for user2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: user2@???
@@ -20,7 +21,8 @@ checks incoming messages on this system. The following error was given:
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <user2@???>)
     id 10HmaY-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: user2@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0551.userx b/test/mail/0551.userx
index 01ca394..3c4b8ee 100644
--- a/test/mail/0551.userx
+++ b/test/mail/0551.userx
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -11,7 +12,8 @@ Message 1
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -22,7 +24,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0551.usery b/test/mail/0551.usery
index e4d855b..0cc28e7 100644
--- a/test/mail/0551.usery
+++ b/test/mail/0551.usery
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0551.userz b/test/mail/0551.userz
index 29b2f0d..4399da8 100644
--- a/test/mail/0551.userz
+++ b/test/mail/0551.userz
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/0566.userx b/test/mail/0566.userx
index e5f0975..d5c4a50 100644
--- a/test/mail/0566.userx
+++ b/test/mail/0566.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=Testing)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -16,7 +17,8 @@ Received: from CALLER (helo=Testing)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -29,7 +31,8 @@ Received: from CALLER (helo=Testing)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0567.rcptok b/test/mail/0567.rcptok
index deffea8..5c0c185 100644
--- a/test/mail/0567.rcptok
+++ b/test/mail/0567.rcptok
@@ -2,7 +2,8 @@ From mailok@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <mailok@???>)
     id 10HmaX-0005vi-00
-    for rcptok@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rcptok@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 cond: accept
 X-Data-2: Line two
 X-Data-5: Line five
@@ -33,7 +34,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for rcptok@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rcptok@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>


diff --git a/test/mail/0573.limited b/test/mail/0573.limited
index 6c6cf51..279b95f 100644
--- a/test/mail/0573.limited
+++ b/test/mail/0573.limited
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for limited@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for limited@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fred@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <limited@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <limited@???>)
     id 10HmaZ-0005vi-00
-    for fred@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for fred@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: limited@???
diff --git a/test/mail/0573.not_limited b/test/mail/0573.not_limited
index e0f1509..9a85ce1 100644
--- a/test/mail/0573.not_limited
+++ b/test/mail/0573.not_limited
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for not_limited@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for not_limited@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: fred@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <not_limited@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <not_limited@???>)
     id 10HmaX-0005vi-00
-    for fred@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for fred@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: not_limited@???
diff --git a/test/mail/0580.local b/test/mail/0580.local
index 5ee7d9d..9df481d 100644
--- a/test/mail/0580.local
+++ b/test/mail/0580.local
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER
index 9b2bf61..2cd5947 100644
--- a/test/mail/0600.CALLER
+++ b/test/mail/0600.CALLER
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 x-test-header-good1: 1234567890qwertzuiopasdfghjklyxcvbnm,.-QWERTZUIOP+*ASDFGHJKL#'YXCVBNM,.-;:_
 x-test-header-good2: ßüöä€ÜÖÄ´ऑकजᐁᑌᑕ𫝆𫟘
 x-test-header-too-short: ?.?.?.ä-??.-Ü.?..?.-?.-?..-??.-??.-??.-??.-?..-???..???.
@@ -18,7 +19,7 @@ From: CALLER@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
-X-message-linecount: 17
+X-message-linecount: 18
 X-received-count: 1


 This is a test message.
@@ -32,14 +33,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: second
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
-X-message-linecount: 9
+X-message-linecount: 10
 X-received-count: 1


 This is a second test message.
diff --git a/test/mail/0606.b b/test/mail/0606.b
index ef81a09..c8b3b82 100644
--- a/test/mail/0606.b
+++ b/test/mail/0606.b
@@ -3,7 +3,8 @@ Envelope-to: a@???
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: foo
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0608.bounce_message b/test/mail/0608.bounce_message
index ad949ce..2af284a 100644
--- a/test/mail/0608.bounce_message
+++ b/test/mail/0608.bounce_message
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: a@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.1 - Default deny message
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -52,7 +54,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbF-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: b@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -92,7 +95,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.2 - Specified deny message file
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -104,7 +108,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbG-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: c@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -143,7 +148,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.3 - Specified, missing deny message file
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -155,7 +161,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbH-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: d@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -194,7 +201,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for d@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for d@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.4 - Specified, non-absolute
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -206,7 +214,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbI-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: e@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -245,7 +254,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for e@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for e@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.5 - Specified, expansion empty
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -257,7 +267,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbJ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: f@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -296,7 +307,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for f@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for f@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.6 - Specified, expansion tainted
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -308,7 +320,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbL-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: g@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -348,7 +361,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbK-0005vi-00
-    for g@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for g@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 1.7 - Specified, expansion good
 Message-Id: <E10HmbK-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -360,7 +374,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbP-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -408,7 +423,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbM-0005vi-00
-    for delay_p@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for delay_p@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.1 - Default delay message
 Message-Id: <E10HmbM-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -420,7 +436,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbQ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -461,7 +478,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbN-0005vi-00
-    for delay_q@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for delay_q@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.2 - Specified delay message file
 Message-Id: <E10HmbN-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -473,7 +491,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbR-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -521,7 +540,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for delay_r@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for delay_r@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.3 - Specified, missing delay message file
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -533,7 +553,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbS-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: CALLER@???
@@ -574,7 +595,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbO-0005vi-00
-    for delay_s@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for delay_s@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test 2.7 - Specified, expansion good
 Message-Id: <E10HmbO-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/mail/0612.rmt_accept b/test/mail/0612.rmt_accept
index 3f11215..e315bd9 100644
--- a/test/mail/0612.rmt_accept
+++ b/test/mail/0612.rmt_accept
@@ -3,12 +3,14 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <b@???>)
     id 10HmaZ-0005vi-00
-    for rmt_accept@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rmt_accept@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [ip4.ip4.ip4.ip4] (helo=testclient)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <b@???>)
     id 10HmaY-0005vi-00
-    for rmt_accept@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for rmt_accept@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test



diff --git a/test/mail/0906.a b/test/mail/0906.a
index a55f68d..3e58a13 100644
--- a/test/mail/0906.a
+++ b/test/mail/0906.a
@@ -3,15 +3,17 @@ Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
     by testhost.test.ex with esmtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [127.0.0.1] (helo=test.com)
     by testhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <sender@dom>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: foo
 X-body-linecount: 0
-X-message-linecount: 10
+X-message-linecount: 12
 X-received-count: 2


 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890
diff --git a/test/mail/1001.userx b/test/mail/1001.userx
index 5eac310..8801e58 100644
--- a/test/mail/1001.userx
+++ b/test/mail/1001.userx
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
@@ -11,7 +12,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6]
@@ -20,7 +22,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] (helo=[IPV6:V6NET:0:12:1:a00:20ff:fe86:a062])
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 To: userx@???


 EHLO [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062]
diff --git a/test/mail/1103.userx b/test/mail/1103.userx
index 66c128b..c3b33db 100644
--- a/test/mail/1103.userx
+++ b/test/mail/1103.userx
@@ -4,7 +4,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


 This is a test encrypted message.
diff --git a/test/mail/1104.userx b/test/mail/1104.userx
index 232d7a7..88e6b10 100644
--- a/test/mail/1104.userx
+++ b/test/mail/1104.userx
@@ -3,7 +3,8 @@ Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher= peerdn=


 This is a test unencrypted message.
diff --git a/test/mail/1110.userx b/test/mail/1110.userx
index b0fce86..ad6260f 100644
--- a/test/mail/1110.userx
+++ b/test/mail/1110.userx
@@ -4,7 +4,8 @@ Received: from [127.0.0.1] (helo=rhu.barb)
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''


 This is a test encrypted message.
@@ -15,7 +16,8 @@ Received: from [ip4.ip4.ip4.ip4]
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn 'CN=Phil Pennock'


 This is a test encrypted message from a verified host.
diff --git a/test/mail/1150.CALLER b/test/mail/1150.CALLER
index f7669bd..c130ffb 100644
--- a/test/mail/1150.CALLER
+++ b/test/mail/1150.CALLER
@@ -4,11 +4,13 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -21,10 +23,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
     by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1150.abcd b/test/mail/1150.abcd
index 8a6aae2..ef26082 100644
--- a/test/mail/1150.abcd
+++ b/test/mail/1150.abcd
@@ -4,10 +4,12 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abcd@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1150.xyz b/test/mail/1150.xyz
index e304d94..c605749 100644
--- a/test/mail/1150.xyz
+++ b/test/mail/1150.xyz
@@ -3,10 +3,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
     by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1157.usera b/test/mail/1157.usera
index 8aac112..02e9c1c 100644
--- a/test/mail/1157.usera
+++ b/test/mail/1157.usera
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for usera@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usera@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for usera@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usera@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1157.userb b/test/mail/1157.userb
index 0a98cd8..cbcb038 100644
--- a/test/mail/1157.userb
+++ b/test/mail/1157.userb
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for userb@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userb@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userb@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userb@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1157.userc b/test/mail/1157.userc
index efb32a6..2528219 100644
--- a/test/mail/1157.userc
+++ b/test/mail/1157.userc
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for userc@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userc@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userc@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userc@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1157.userx b/test/mail/1157.userx
index f720f91..d8c1227 100644
--- a/test/mail/1157.userx
+++ b/test/mail/1157.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1157.usery b/test/mail/1157.usery
index 32797e1..244523d 100644
--- a/test/mail/1157.usery
+++ b/test/mail/1157.usery
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1157.userz b/test/mail/1157.userz
index 919c86d..6028093 100644
--- a/test/mail/1157.userz
+++ b/test/mail/1157.userz
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1159.userx b/test/mail/1159.userx
index 1a86c2a..2062ab0 100644
--- a/test/mail/1159.userx
+++ b/test/mail/1159.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -22,11 +24,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1160.CALLER b/test/mail/1160.CALLER
index f7669bd..c130ffb 100644
--- a/test/mail/1160.CALLER
+++ b/test/mail/1160.CALLER
@@ -4,11 +4,13 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -21,10 +23,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
     by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1160.abcd b/test/mail/1160.abcd
index 8a6aae2..ef26082 100644
--- a/test/mail/1160.abcd
+++ b/test/mail/1160.abcd
@@ -4,10 +4,12 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abcd@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1160.xyz b/test/mail/1160.xyz
index e304d94..c605749 100644
--- a/test/mail/1160.xyz
+++ b/test/mail/1160.xyz
@@ -3,10 +3,12 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
     by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmbA-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1163.userx0 b/test/mail/1163.userx0
index 5d80e98..c624c2b 100644
--- a/test/mail/1163.userx0
+++ b/test/mail/1163.userx0
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx0@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx0@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1163.userx1 b/test/mail/1163.userx1
index 1acf09c..4b6fd69 100644
--- a/test/mail/1163.userx1
+++ b/test/mail/1163.userx1
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1163.usery0 b/test/mail/1163.usery0
index 6030779..c7c6496 100644
--- a/test/mail/1163.usery0
+++ b/test/mail/1163.usery0
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for usery0@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery0@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1163.usery1 b/test/mail/1163.usery1
index e1b08c6..fa57c65 100644
--- a/test/mail/1163.usery1
+++ b/test/mail/1163.usery1
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for usery1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1163.userz0 b/test/mail/1163.userz0
index 9f45587..9f72223 100644
--- a/test/mail/1163.userz0
+++ b/test/mail/1163.userz0
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userz0@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz0@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/1163.userz1 b/test/mail/1163.userz1
index 17e3991..fad6696 100644
--- a/test/mail/1163.userz1
+++ b/test/mail/1163.userz1
@@ -4,10 +4,12 @@ Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userz1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index dc634d1..adeef5a 100644
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -4,7 +4,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -16,7 +17,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <"name with spaces"@???>)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -28,7 +30,8 @@ Received: from [ip4.ip4.ip4.ip4]
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=CN=server2.example.com


@@ -40,7 +43,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -53,7 +57,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx peerdn=


diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 08f034e..4986bb6 100644
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2027.usery b/test/mail/2027.usery
index e76df9b..c2801d9 100644
--- a/test/mail/2027.usery
+++ b/test/mail/2027.usery
@@ -3,11 +3,13 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 4f38103..13dcbf2 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -4,7 +4,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <a@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -16,7 +17,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <"name with spaces"@???>)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -28,7 +30,8 @@ Received: from [ip4.ip4.ip4.ip4]
     (Exim x.yz)
     (envelope-from <b@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com


@@ -40,7 +43,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <c@???>)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx peerdn=


diff --git a/test/mail/2127.userx b/test/mail/2127.userx
index 08f034e..4986bb6 100644
--- a/test/mail/2127.userx
+++ b/test/mail/2127.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2127.usery b/test/mail/2127.usery
index e76df9b..c2801d9 100644
--- a/test/mail/2127.usery
+++ b/test/mail/2127.usery
@@ -3,11 +3,13 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 1edd493..4e35082 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -4,7 +4,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -16,7 +17,8 @@ Received: from [127.0.0.1]
     (Exim x.yz)
     (envelope-from <"name with spaces"@???>)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=


@@ -28,7 +30,8 @@ Received: from [ip4.ip4.ip4.ip4]
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server1.example.com


diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index 06590b3..72c9a3f 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2600.userx b/test/mail/2600.userx
index 3e636bd..6b7d159 100644
--- a/test/mail/2600.userx
+++ b/test/mail/2600.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2610.ph10 b/test/mail/2610.ph10
index 3305d49..7109944 100644
--- a/test/mail/2610.ph10
+++ b/test/mail/2610.ph10
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for ph10@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2620.ph10 b/test/mail/2620.ph10
index 1e1294c..bd5306c 100644
--- a/test/mail/2620.ph10
+++ b/test/mail/2620.ph10
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3400.userx b/test/mail/3400.userx
index bde3d22..8476888 100644
--- a/test/mail/3400.userx
+++ b/test/mail/3400.userx
@@ -6,7 +6,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000


Testing unauthenticated.

@@ -18,7 +19,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000


Testing unauthenticated (2).

@@ -30,7 +32,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: mylogin


 Testing authenticated.
@@ -43,7 +46,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: mylogin
 X-Authenticated-Sender: auth@???


@@ -57,7 +61,8 @@ Received: from [10.0.0.3] (helo=testclient.ex ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: mylogin


 Testing authenticated (3).
@@ -70,7 +75,8 @@ Received: from [10.0.0.1] (helo=test.host ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: login
 X-Authenticated-ID: userx


@@ -84,7 +90,8 @@ Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 authentication-failed: 0


 Without authenticating
@@ -97,7 +104,8 @@ Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 authentication-failed: 0
 X-Host-Authenticated: mylogin


@@ -111,7 +119,8 @@ Received: from [10.0.0.5] (helo=testing.testing ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <x@y>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 authentication-failed: 1
 X-Host-Authenticated: mylogin


diff --git a/test/mail/3403.userx b/test/mail/3403.userx
index 9ec9b79..1b07e25 100644
--- a/test/mail/3403.userx
+++ b/test/mail/3403.userx
@@ -5,7 +5,8 @@ Received: from CALLER (helo=testing.ex)
     by myhost.test.ex with local-esmtpa (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3411.postmaster b/test/mail/3411.postmaster
index db8f902..215795d 100644
--- a/test/mail/3411.postmaster
+++ b/test/mail/3411.postmaster
@@ -2,7 +2,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [10.0.0.0] (helo=rhu.barb ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000


Message 6

diff --git a/test/mail/3411.userx b/test/mail/3411.userx
index db8f902..215795d 100644
--- a/test/mail/3411.userx
+++ b/test/mail/3411.userx
@@ -2,7 +2,8 @@ From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [10.0.0.0] (helo=rhu.barb ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000


Message 6

diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index b9df8e5..3395cdf 100644
--- a/test/mail/3451.userx
+++ b/test/mail/3451.userx
@@ -4,17 +4,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -28,17 +31,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 6116a01..0c021c7 100644
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -22,11 +24,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index b9df8e5..3395cdf 100644
--- a/test/mail/3461.userx
+++ b/test/mail/3461.userx
@@ -4,17 +4,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -28,17 +31,20 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3462.userx b/test/mail/3462.userx
index 6116a01..0c021c7 100644
--- a/test/mail/3462.userx
+++ b/test/mail/3462.userx
@@ -4,11 +4,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -22,11 +24,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3500.userx b/test/mail/3500.userx
index c6910af..f6f8794 100644
--- a/test/mail/3500.userx
+++ b/test/mail/3500.userx
@@ -6,7 +6,8 @@ Received: from [10.0.0.1] (helo=test.host ident=CALLER)
     by myhost.test.ex with esmtpa (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Host-Authenticated: cram_md5
 X-Authenticated-ID: tim


diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps
index 66d2afe..f844cf2 100644
--- a/test/mail/3700.smtps
+++ b/test/mail/3700.smtps
@@ -7,11 +7,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <ok@???>)
     id 10HmbA-0005vi-00
-    for smtps@y; Tue, 2 Mar 1999 09:44:33 +0000
+    for smtps@y;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@???>)
     id 10HmaY-0005vi-00
-    for smtps@y; Tue, 2 Mar 1999 09:44:33 +0000
+    for smtps@y;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: ok@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/3700.x b/test/mail/3700.x
index d520cfe..8e82508 100644
--- a/test/mail/3700.x
+++ b/test/mail/3700.x
@@ -7,11 +7,13 @@ Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
     (Exim x.yz)
     (envelope-from <ok@???>)
     id 10HmaZ-0005vi-00
-    for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@y;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@???>)
     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@???>
 From: ok@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4000.userx b/test/mail/4000.userx
index 92776ed..0712716 100644
--- a/test/mail/4000.userx
+++ b/test/mail/4000.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@???>
 To: a-list00@???
@@ -136,7 +137,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@???>
 To: a-list00@???
@@ -185,7 +187,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@???>
 To: a-list00@???
@@ -223,7 +226,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@???>
 To: a-list00@???
@@ -259,7 +263,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@???>
 To: a-list00@???
@@ -300,7 +305,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-ID: <20041217133501.GA3058@???>
 Subject: Nasty5
@@ -366,7 +372,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 From: J Caesar <jcaesar@???>
 To: a-list00@???
diff --git a/test/mail/4002.userx b/test/mail/4002.userx
index 59fa44a..6bc565c 100644
--- a/test/mail/4002.userx
+++ b/test/mail/4002.userx
@@ -3,7 +3,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: Test person <tp@???>
 To: Me <userx@???>
 Subject: A real test message
@@ -18,7 +19,8 @@ Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: Test person <tp@???>
 To: Me <userx@???>
 Subject: A real test message
diff --git "a/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
index b93a5b2..34a2b79 100644
--- "a/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
+++ "b/test/mail/4203.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
@@ -4,7 +4,8 @@ Envelope-to: यहलोगहिन्दीक्योंनहींबो
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local; Tue, 2 Mar 1999 09:44:33 +0000
+    for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -46,7 +47,8 @@ Received: from CALLER (helo=client.ffail)
     by the.local.host.name with utf8local-esmtp (Exim x.yz)
     (envelope-from <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local>)
     id 10HmaX-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
diff --git "a/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
index b93a5b2..34a2b79 100644
--- "a/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
+++ "b/test/mail/4213.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
@@ -4,7 +4,8 @@ Envelope-to: यहलोगहिन्दीक्योंनहींबो
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local; Tue, 2 Mar 1999 09:44:33 +0000
+    for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -46,7 +47,8 @@ Received: from CALLER (helo=client.ffail)
     by the.local.host.name with utf8local-esmtp (Exim x.yz)
     (envelope-from <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local>)
     id 10HmaX-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
diff --git "a/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202" "b/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
index b93a5b2..34a2b79 100644
--- "a/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
+++ "b/test/mail/4223.\340\244\257\340\244\271\340\244\262\340\245\213\340\244\227\340\244\271\340\244\277\340\244\250\340\245\215\340\244\246\340\245\200\340\244\225\340\245\215\340\244\257\340\245\213\340\244\202\340\244\250\340\244\271\340\245\200\340\244\202\340\244\254\340\245\213\340\244\262\340\244\270\340\244\225\340\244\244\340\245\207\340\244\271\340\245\210\340\244\202"
@@ -4,7 +4,8 @@ Envelope-to: यहलोगहिन्दीक्योंनहींबो
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local; Tue, 2 Mar 1999 09:44:33 +0000
+    for यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userz@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -46,7 +47,8 @@ Received: from CALLER (helo=client.ffail)
     by the.local.host.name with utf8local-esmtp (Exim x.yz)
     (envelope-from <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local>)
     id 10HmaX-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local
diff --git a/test/mail/4520.a b/test/mail/4520.a
index 94fd9a4..39d0758 100644
--- a/test/mail/4520.a
+++ b/test/mail/4520.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=LygSZ5OCGlY
     /fF+ReGidcyXZw1l+NbhyXEkQYrSrQV/BqEL34Ql4v7PS6BPwkkdSojQ+b6vZUKwiFV5SoWb81N06
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 From: second@???
 Message-Id: <E10HmaY-0005vi-00@???>
diff --git a/test/mail/4520.b b/test/mail/4520.b
index b80dc71..9fb6914 100644
--- a/test/mail/4520.b
+++ b/test/mail/4520.b
@@ -3,14 +3,16 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;
     t=T; x=T+10; b=bbbb;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbA-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4520.b10 b/test/mail/4520.b10
index de3c9cd..9b33d6f 100644
--- a/test/mail/4520.b10
+++ b/test/mail/4520.b10
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for b10@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b10@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
     7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for b10@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b10@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbC-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4520.b12 b/test/mail/4520.b12
index 392cee3..b41f7e5 100644
--- a/test/mail/4520.b12
+++ b/test/mail/4520.b12
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for b12@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b12@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=X-mine:X-mine:From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;
     b=VSF3Fmf7fHLpqKWgaG0t/RJdd+7JJNRN/+q7Gcz0xtIOjt5tL4Pfc4VDSeQYPq6e1pCcjvj79k5
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for b12@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b12@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 X-mine: one
 X-mine: two
diff --git a/test/mail/4520.b20 b/test/mail/4520.b20
index cc84e78..02da74c 100644
--- a/test/mail/4520.b20
+++ b/test/mail/4520.b20
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for b20@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b20@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=X-Mine; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=VJ0NOLNRm
     RSvCCwV1TxNy+33gc34TrxCjTDl12GiW4E1N92MQwuhgzUPStxZDI+A8BqK/OFovhEwz775NfUgAz
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for b20@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b20@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbG-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4520.b22 b/test/mail/4520.b22
index 2b1e433..bf687ff 100644
--- a/test/mail/4520.b22
+++ b/test/mail/4520.b22
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbJ-0005vi-00
-    for b22@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b22@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=X-mine:X-mine:X-Mine;
     bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=xdhDHWeO9R0K1mMCManMqUGXH3
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for b22@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b22@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 X-mine: one
 X-mine: two
diff --git a/test/mail/4520.d b/test/mail/4520.d
index df5ea50..b8b5aec 100644
--- a/test/mail/4520.d
+++ b/test/mail/4520.d
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbL-0005vi-00
-    for d@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for d@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel_bad; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=pL614V/
     QAEOFdf403ELt483LzdOxQoo+jSheIIOxccgWFWz7HRjVGASRCU20k2GlYfRomm/tVkp+vf1yw6Oj
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbK-0005vi-00
-    for d@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for d@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbK-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4520.e b/test/mail/4520.e
index 5cc5bb8..3b9931e 100644
--- a/test/mail/4520.e
+++ b/test/mail/4520.e
@@ -3,11 +3,13 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbN-0005vi-00
-    for e@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for e@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbM-0005vi-00
-    for e@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for e@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbM-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4520.f b/test/mail/4520.f
index 4e6d96d..cc8bc63 100644
--- a/test/mail/4520.f
+++ b/test/mail/4520.f
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbP-0005vi-00
-    for f@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for f@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=gs+F4Uhr+N4qZhWyfctULkCwprl/tvOnzqNhsmpAFW4=; b=A3l0nyvB3OK
     NuIDfQJg0wynUUH4AWSRdDUNmhkTNo2RW/ifLCWBky6AXfkaHENJRewncjoVcn92d0cbTF4gDEhUi
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbO-0005vi-00
-    for f@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for f@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbO-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4523.a b/test/mail/4523.a
index bfe4045..ea00a45 100644
--- a/test/mail/4523.a
+++ b/test/mail/4523.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha512; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From:From; bh=6B2m0DINYQYGHTvmDYQAfAm/wCDFh+Oj57jE2G4jz4nAeJfmjTB6tz
     me+A5nT6AQ4J3N47vffXLG1exv8bzFZw==; b=YFIC4khvqvXRd8I3r3YTdQqG/SbtDIAYTYVkIo3
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha512; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4524.c b/test/mail/4524.c
index 92d09af..8e61da1 100644
--- a/test/mail/4524.c
+++ b/test/mail/4524.c
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=ses; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=
     hjRHwrwAxKFsul1+Bj1XU0YSi0cMQO5hzSItwtaAP++3E9DdxAzeenuRmCyL4o5NQSWY9gMArptRz
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4525.a b/test/mail/4525.a
index 2f78aec..7a8b89c 100644
--- a/test/mail/4525.a
+++ b/test/mail/4525.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
     7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4525.b b/test/mail/4525.b
index 6cd2538..e47b388 100644
--- a/test/mail/4525.b
+++ b/test/mail/4525.b
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
     wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaZ-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -29,7 +31,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
     wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -38,7 +41,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbD-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4525.c b/test/mail/4525.c
index 1032c0d..a908d75 100644
--- a/test/mail/4525.c
+++ b/test/mail/4525.c
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
     wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -12,7 +13,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbB-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
@@ -29,7 +31,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=bzHKix52TV0ojCi2kd18gmIw/tcd5TnhO3QM+89xwyk=; b=LcQAFwKN9DL
     wCbK0mcUtjmEoLaNUjwHmVrilQI1nBWJDoDUzpUl96U8YzdS/+Xut+pdS/YZf3m/Qbcw6ohO9pEmM
@@ -38,7 +41,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmbF-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4530.y b/test/mail/4530.y
index 3554379..8b932d6 100644
--- a/test/mail/4530.y
+++ b/test/mail/4530.y
@@ -3,7 +3,8 @@ Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
     by testhost.test.ex with esmtp (Exim x.yz)
     id 10HmaY-0005vi-00
-    for y@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for y@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D
     sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape
@@ -13,10 +14,11 @@ Received: from [127.0.0.1] (helo=xxx)
     by testhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for y@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for y@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: simple test
 X-body-linecount: 0
-X-message-linecount: 15
+X-message-linecount: 17
 X-received-count: 2


 Line 1: This is a simple test.
diff --git a/test/mail/4530.z b/test/mail/4530.z
index f81ae7b..777e6a6 100644
--- a/test/mail/4530.z
+++ b/test/mail/4530.z
@@ -3,7 +3,8 @@ Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
     by testhost.test.ex with esmtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for z@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for z@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=Subject; bh=CVpkzY75tV/NCKk5pPx4GnM3NX83xwCiT0xVwo0G1Rs=; b=JTYpVY1D
     sO37MibaZTC2CgpQAZlz/lRefFQv3Q7JM4D0aUfseT24Xg+kxv3xc5guSzKWQzycm3zie366tHape
@@ -13,10 +14,11 @@ Received: from [127.0.0.1] (helo=xxx)
     by testhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for z@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for z@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: simple test
 X-body-linecount: 0
-X-message-linecount: 15
+X-message-linecount: 17
 X-received-count: 2


 Line 1: This is a simple test.
diff --git a/test/mail/4541.a b/test/mail/4541.a
index e1c95f0..660be94 100644
--- a/test/mail/4541.a
+++ b/test/mail/4541.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
     7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4541.b b/test/mail/4541.b
index 7927bbc..9f073d9 100644
--- a/test/mail/4541.b
+++ b/test/mail/4541.b
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
     s=sel; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=toy5chxow6W
     7Nn3qMvjZs+i0H00bQfi+6nakV6i36cRrZM/oWziHrc5IfYZuQunWNUA9UHnatK35Nsl7ZJRBU4em
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaZ-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4545.a b/test/mail/4545.a
index 18752a7..8b5ce8f 100644
--- a/test/mail/4545.a
+++ b/test/mail/4545.a
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
     ; s=sed; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; 
     b=5fhyD3EILDrnL4DnkD4hDaeis7+GSzL9GMHrhIDZJjuJ00WD5iI8SQ1q9rDfzFL/Kdw0VIyB4RD
@@ -11,7 +12,8 @@ DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaX-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4545.b b/test/mail/4545.b
index 80f6e49..e64441c 100644
--- a/test/mail/4545.b
+++ b/test/mail/4545.b
@@ -3,7 +3,8 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex
     ; s=sed; h=From; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; b=IKNwoUbCe
     ayHoA7j2L0IU1IFuapa3DrlNx9wPlBodM1iKJ57WGibKzefQNdTjymHPsMlQ9fS+h9ZSsHmVNBdDA
@@ -16,7 +17,8 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex;
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 Message-Id: <E10HmaZ-0005vi-00@???>
 Sender: CALLER_NAME <CALLER@???>
diff --git a/test/mail/4550.store b/test/mail/4550.store
index 74d1338..2d576cb 100644
--- a/test/mail/4550.store
+++ b/test/mail/4550.store
@@ -3,10 +3,12 @@ Return-path: <>
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: baduser@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -47,7 +49,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: nobody@???
 From: second@???
 Message-Id: <E10HmaX-0005vi-00@???>
diff --git a/test/mail/4560.a b/test/mail/4560.a
index 5715553..b030219 100644
--- a/test/mail/4560.a
+++ b/test/mail/4560.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
         xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
         YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
@@ -34,7 +35,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
      b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
       AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -53,7 +55,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test


 This is a test body.
@@ -66,7 +69,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
      b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy
       u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6
@@ -87,7 +91,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
      b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
       AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -106,7 +111,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for zza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for zza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test


 This is a test body.
@@ -119,7 +125,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=3; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
      b=advgCcXZhwJFZi5rzQgnThsSOX6MsCpnXWxyub3UbuQI5RonZOw7SwEVJ2j4Q32z1d54wws1/c
       2MJeB2ChZUy+J0rNrXLEWsZZtOrQDx1fEaGL7sXC8RYshnkboBiN8lbkuoZHUZWPILKIWd5V2M
@@ -140,7 +147,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
      b=odwQlZ9ZCMTWG30i3IPycNo+3kLWIngjWVJKGF8d8CfNEIEeK7ao89Wy9bPEwcnXHYN2HnDjtL
       UXPiuo0BLPS4UCAvVdBd1Kr/rUHfoIysIFF6OggChI2ZeUqRlkD1GRV7C5LACsDrGR+HQQzXPI
@@ -161,7 +169,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for mza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for mza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
      b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
       AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -180,7 +189,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for zmza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for zmza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test


 This is a test body.
@@ -197,7 +207,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbL-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=3; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
      b=SwyS6CAxe1WUpQ6/gjhehp05c2J3qn5TgqiEzNZENLQ0LmoFesan/Hs/WUXsu68TWbk12zSYGl
       j8SymB40wpTVbyI0nB9X3f/EV35apVdZCCbb7fhDcItiaveQAYAQjupnD1Gzf7bvkFnHUNIyvc
@@ -218,7 +229,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbK-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
     iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
     arc=pass (i=2) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
@@ -226,7 +238,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbJ-0005vi-00
-    for mza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for mza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
      b=gQvDl2aKy+MEWgwP9A31sLHf4b6zOSwZhglgBrO2apeKFIRv54YTKVe44/6D0iJurZM8mjndMy
       u78sFMRrBb6zm99rUiEg48TDqIXOCJkSBpArs2liF34HdzpCsJxMgIIhxxNyVzjGGQdQCvSxm6
@@ -247,7 +260,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
-    for zmza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for zmza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
      b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
       AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -266,7 +280,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
-    for zzmza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for zzmza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test


 This is a test body.
@@ -283,7 +298,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbO-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
     iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
     arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.remote-ip=127.0.0.1
@@ -291,7 +307,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbN-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
      b=DaGjkoR0m1B7KxZMbkzZFTviDSdrEf+VX4N7wo/f6PCDHEnt3fiIg646KrbgQHZQG23rVlPm72
       AaJMBhVpewKjPtdc/7fNY3Kgyp4ttwug8jMEGYU1cgaJjkx3Xp/HMk52b3HVnPvV900YNrmfGC
@@ -310,7 +327,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbM-0005vi-00
-    for zza@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for zza@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test


 This is a test body.
@@ -326,7 +344,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbQ-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
      b=e1ldkzDyxJIvQd+ZOylCkekKOj3WVUZiptsJYuoiM0tsBRoiHA5O6RDwrNzCQxRWT05PzW3GBy
       Dkiejo2w30n9QBueQH4h8BvCl/QMlmmdaIy02ZKqfvtp1hxR125TREXdigK9ULQZF4rIrDma5S
@@ -353,7 +372,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbP-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from dragon.trusteddomain.org (localhost [127.0.0.1])
     by dragon.trusteddomain.org (8.14.5/8.14.5) with ESMTP id w121YG2q036577;
     Tue, 2 Mar 1999 09:44:33 +0000 (PST)
@@ -487,14 +507,16 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbS-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
     arc=none
 Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbR-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test


 This is a test body.
diff --git a/test/mail/4561.a b/test/mail/4561.a
index 38b81af..127c29a 100644
--- a/test/mail/4561.a
+++ b/test/mail/4561.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=none; a=rsa-sha256; d=test.ex; s=r201803;
       b=HxjMzNcj7OX+I9Vr1Xr14AGgAci/CI8JxspaeoNT7TBsiOAtZ+YDBBSqXe6fqX3mHQEwpnXrdz
        PCMIU1SF3ZiBtqWaLBPhStfuNQl5cw+TWXC60rOwCD2bxuBqubM/3AZLMPzIpm62MUYUUGaxwi
diff --git a/test/mail/4562.a b/test/mail/4562.a
index 4a83ce6..aa346da 100644
--- a/test/mail/4562.a
+++ b/test/mail/4562.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <has_arc@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
         xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
         YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
@@ -33,7 +34,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <no_arc@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: mrgus@???
 To: bakawolf@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4563.a b/test/mail/4563.a
index e4082a5..4b831d8 100644
--- a/test/mail/4563.a
+++ b/test/mail/4563.a
@@ -5,7 +5,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
         xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
         YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
diff --git a/test/mail/4565.a b/test/mail/4565.a
index 7346a7c..9efab94 100644
--- a/test/mail/4565.a
+++ b/test/mail/4565.a
@@ -9,7 +9,8 @@ Received: from localhost ([127.0.0.1] helo=test.ex)
     by test.ex with esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
      b=1J94ImExSjtnwHY/c/aN3BX/xlnQfi6CPdGQvbeSdsbCCEtOqK9547tA54tYFh8beeVECAR0xu
       9fCSAjZ/0WM7mrxKNMbWkoHNoejUhNkcxJOtFmiS/0JKPQGk8HTE7FHLbogUQvEJoVBBnqo6xW
@@ -41,7 +42,8 @@ Received: from [127.0.0.1] (helo=xxx)
     by test.ex with smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for za@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for za@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
     d=example.com; s=sel; h=List-Archive;
      bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=uslVEq1LzHDR2ACoSTiErsGhe
diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index f42604b..86a9478 100644
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -2,10 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
     by the.local.host.name with esmtp (Exim x.yz)
     id 10HmbA-0005vi-00
-    for SRS0=ZZZZ=YY=the.local.host.name=CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for SRS0=ZZZZ=YY=the.local.host.name=CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for SRS0=ZZZZ=YY=the.local.host.name=CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for SRS0=ZZZZ=YY=the.local.host.name=CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: remote_user@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -45,11 +47,13 @@ Received: from localhost ([127.0.0.1] helo=the.local.host.name)
     by the.local.host.name with esmtp (Exim x.yz)
     (envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@???>)
     id 10HmaY-0005vi-00
-    for remote_user@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for remote_user@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for redirect@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for redirect@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4620.fred[ b/test/mail/4620.fred[
index 3a6cf1f..8482b00 100644
--- a/test/mail/4620.fred[
+++ b/test/mail/4620.fred[
@@ -2,10 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=the.local.host.name)
     by the.local.host.name with esmtp (Exim x.yz)
     id 10HmbE-0005vi-00
-    for "SRS0=ZZZZ=YY=test.ex=fred["@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for "SRS0=ZZZZ=YY=test.ex=fred["@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbD-0005vi-00
-    for "SRS0=ZZZZ=YY=test.ex=fred["@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for "SRS0=ZZZZ=YY=test.ex=fred["@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: remote_user@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -45,11 +47,13 @@ Received: from localhost ([127.0.0.1] helo=the.local.host.name)
     by the.local.host.name with esmtp (Exim x.yz)
     (envelope-from <"SRS0=ZZZZ=YY=test.ex=fred["@???>)
     id 10HmbC-0005vi-00
-    for remote_user@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for remote_user@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by the.local.host.name with local (Exim x.yz)
     (envelope-from <"fred["@???>)
     id 10HmbB-0005vi-00
-    for redirect@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for redirect@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: "fred["@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/4700.CALLER b/test/mail/4700.CALLER
index dd396d9..378b05d 100644
--- a/test/mail/4700.CALLER
+++ b/test/mail/4700.CALLER
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -48,7 +49,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -61,7 +63,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
@@ -122,7 +125,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/1.myhost.test.ex b/test/mail/5000.new/1.myhost.test.ex
index efa7079..f960a63 100644
--- a/test/mail/5000.new/1.myhost.test.ex
+++ b/test/mail/5000.new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/2.myhost.test.ex b/test/mail/5000.new/2.myhost.test.ex
index e2afa21..2f30d1c 100644
--- a/test/mail/5000.new/2.myhost.test.ex
+++ b/test/mail/5000.new/2.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/3.myhost.test.ex:S370 b/test/mail/5000.new/3.myhost.test.ex:S370
index 7225056..e178ce3 100644
--- a/test/mail/5000.new/3.myhost.test.ex:S370
+++ b/test/mail/5000.new/3.myhost.test.ex:S370
@@ -2,7 +2,8 @@ Envelope-to: userx@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/4.myhost.test.ex,S=370 b/test/mail/5000.new/4.myhost.test.ex,S=370
index d7b4768..f712cb9 100644
--- a/test/mail/5000.new/4.myhost.test.ex,S=370
+++ b/test/mail/5000.new/4.myhost.test.ex,S=370
@@ -2,7 +2,8 @@ Envelope-to: userx@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/5.myhost.test.ex b/test/mail/5000.new/5.myhost.test.ex
index 41aedbc..0560db7 100644
--- a/test/mail/5000.new/5.myhost.test.ex
+++ b/test/mail/5000.new/5.myhost.test.ex
@@ -2,7 +2,8 @@ Envelope-to: userx@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/6.myhost.test.ex b/test/mail/5000.new/6.myhost.test.ex
index a7210d1..fc64128 100644
--- a/test/mail/5000.new/6.myhost.test.ex
+++ b/test/mail/5000.new/6.myhost.test.ex
@@ -2,7 +2,8 @@ Envelope-to: userx@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
index f33b5f2..1368a85 100644
--- a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
+++ b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
@@ -2,7 +2,8 @@ Envelope-to: userx@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5002.new/1.myhost.test.ex b/test/mail/5002.new/1.myhost.test.ex
index 4b89548..09a065b 100644
--- a/test/mail/5002.new/1.myhost.test.ex
+++ b/test/mail/5002.new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5004.new/1.mail.test.ex b/test/mail/5004.new/1.mail.test.ex
index 88be145..64bf2de 100644
--- a/test/mail/5004.new/1.mail.test.ex
+++ b/test/mail/5004.new/1.mail.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5005.nofile/new/1.myhost.test.ex b/test/mail/5005.nofile/new/1.myhost.test.ex
index 5da3db5..e55556a 100644
--- a/test/mail/5005.nofile/new/1.myhost.test.ex
+++ b/test/mail/5005.nofile/new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for nofile@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nofile@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5005.userx/new/2.myhost.test.ex b/test/mail/5005.userx/new/2.myhost.test.ex
index dcb7049..d579408 100644
--- a/test/mail/5005.userx/new/2.myhost.test.ex
+++ b/test/mail/5005.userx/new/2.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5006.userx/new/1.myhost.test.ex b/test/mail/5006.userx/new/1.myhost.test.ex
index 4db91ee..225c171 100644
--- a/test/mail/5006.userx/new/1.myhost.test.ex
+++ b/test/mail/5006.userx/new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5007.userx/new/1.myhost.test.ex b/test/mail/5007.userx/new/1.myhost.test.ex
index c077e2b..58437c9 100644
--- a/test/mail/5007.userx/new/1.myhost.test.ex
+++ b/test/mail/5007.userx/new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5010.new/1.myhost.test.ex b/test/mail/5010.new/1.myhost.test.ex
index 4b89548..09a065b 100644
--- a/test/mail/5010.new/1.myhost.test.ex
+++ b/test/mail/5010.new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5012.new/1.myhost.test.ex b/test/mail/5012.new/1.myhost.test.ex
index 4b89548..09a065b 100644
--- a/test/mail/5012.new/1.myhost.test.ex
+++ b/test/mail/5012.new/1.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5012.new/2.myhost.test.ex b/test/mail/5012.new/2.myhost.test.ex
index ffc6a3b..9cc907d 100644
--- a/test/mail/5012.new/2.myhost.test.ex
+++ b/test/mail/5012.new/2.myhost.test.ex
@@ -1,7 +1,8 @@
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5050.userx b/test/mail/5050.userx
index 2b5ed98..9d0e91c 100644
--- a/test/mail/5050.userx
+++ b/test/mail/5050.userx
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5050.usery b/test/mail/5050.usery
index fd87afe..d39c10b 100644
--- a/test/mail/5050.usery
+++ b/test/mail/5050.usery
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5050.userz b/test/mail/5050.userz
index 75b251f..aa3fcbc 100644
--- a/test/mail/5050.userz
+++ b/test/mail/5050.userz
@@ -5,7 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -19,7 +20,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for mbx_userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for mbx_userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -32,7 +34,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index 85470f9..5956705 100644
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -3,7 +3,8 @@ Envelope-to: userx@???,
  jill@???
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 mailbox: copied
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -17,7 +18,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Envelope-to: CALLER@???
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: jack@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -57,7 +59,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaX-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 mailbox: copied
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -71,7 +74,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Envelope-to: CALLER@???
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmbA-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: jack@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -111,7 +115,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5200.postmaster b/test/mail/5200.postmaster
index b278ac4..4951889 100644
--- a/test/mail/5200.postmaster
+++ b/test/mail/5200.postmaster
@@ -4,7 +4,8 @@ Envelope-to: postmaster@???
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
 To: postmaster@???
diff --git a/test/mail/5203.userx b/test/mail/5203.userx
index 1cb2875..932e2f1 100644
--- a/test/mail/5203.userx
+++ b/test/mail/5203.userx
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index dce7a83..82f00cd 100644
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -40,7 +41,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for "FAIL cannot route this one (FAIL)"@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for "FAIL cannot route this one (FAIL)"@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5207.qpgm b/test/mail/5207.qpgm
index da024f7..746f640 100644
--- a/test/mail/5207.qpgm
+++ b/test/mail/5207.qpgm
@@ -1,7 +1,8 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -10,7 +11,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/5500.user1 b/test/mail/5500.user1
index a485c7c..19df9b5 100644
--- a/test/mail/5500.user1
+++ b/test/mail/5500.user1
@@ -2,7 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@???



diff --git a/test/mail/5500.userx b/test/mail/5500.userx
index 59fd89b..e5ea8bd 100644
--- a/test/mail/5500.userx
+++ b/test/mail/5500.userx
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
-    id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+    id 10HmaY-0005vi-00;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@???



@@ -9,7 +10,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=rhu.barb)
     by myhost.test.ex with esmtp (Exim x.yz)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Sender: sender@???



diff --git a/test/mail/5902.user1 b/test/mail/5902.user1
index 6cc3901..ecb5864 100644
--- a/test/mail/5902.user1
+++ b/test/mail/5902.user1
@@ -2,7 +2,8 @@ From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0021 b/test/rejectlog/0021
index 3dbf532..daf9ee5 100644
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -4,7 +4,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <userx@test1>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -14,7 +15,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@test2>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaZ-0005vi-00@???>
 F From: ok@test2
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -24,7 +26,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ok@test4>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbA-0005vi-00@???>
 F From: ok@test4
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -42,7 +45,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <userx@test1>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbB-0005vi-00@???>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +56,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <userx@test1>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmbC-0005vi-00@???>
 F From: userx@test1
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 3a6ff66..96682c4 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@???>
   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@???
   Subject: incomprehensible
 F From: <forged@???
@@ -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@???>
   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@???>
   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@???>
 F From: x@y
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -54,7 +59,8 @@ Envelope-from: <>
 Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index b80e616..9ae0806 100644
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -12,7 +12,8 @@ Envelope-from: <>
 Envelope-to: <data@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     id 10HmaX-0005vi-00
-    for data@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Subject: data1
 I Message-Id: <E10HmaX-0005vi-00@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -21,7 +22,8 @@ Envelope-from: <>
 Envelope-to: <data@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     id 10HmaY-0005vi-00
-    for data@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Subject: data2
 I Message-Id: <E10HmaY-0005vi-00@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -30,7 +32,8 @@ Envelope-from: <>
 Envelope-to: <data@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     id 10HmaZ-0005vi-00
-    for data@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Subject: data3
 I Message-Id: <E10HmaZ-0005vi-00@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 32a9d05..1e5600b 100644
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -4,7 +4,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0162 b/test/rejectlog/0162
index 5155969..89361d3 100644
--- a/test/rejectlog/0162
+++ b/test/rejectlog/0162
@@ -4,7 +4,8 @@ Envelope-to: <u3@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for u3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for u3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 T To: <u5@???>,
   <u6@???>,
   <u7@???>,
diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index 5cdd84c..59443bd 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@???>)
     id 10HmaX-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 F From: Me <x@???>
   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 f24b9c1..0246789 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for z@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@???
 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for z@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@???
 1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@???>: 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 cd6586c..5b3680d 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@???>
   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@???>
   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@???>
   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@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0451 b/test/rejectlog/0451
index e261687..40b70ce 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@???>)
     id 10HmaX-0005vi-00
-    for good@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for good@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   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@???>)
     id 10HmaX-0005vi-00
-    for good@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for good@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index cab1438..2f16fd3 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@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index b2ece3e..e78a7a1 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@???>)
     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@???>
 F From: CALLER_NAME <CALLER@???>
   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@???>)
     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@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0482 b/test/rejectlog/0482
index 9bbdd86..e29be34 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 F From                                                                                                                                                                                                                              : userx
diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index ef53406..5ae8529 100644
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -4,7 +4,8 @@ Envelope-to: <aa@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for aa@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for aa@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0505 b/test/rejectlog/0505
index 41fd97e..b6ec7ac 100644
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -4,7 +4,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -15,7 +16,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index ca6243b..2f186fd 100644
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -4,7 +4,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@???, himself <usery@???>, HIMSELF <USERX@???>
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
@@ -15,7 +16,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 T To: a@???, himself <usery@???>
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
@@ -27,7 +29,8 @@ Envelope-to: <userx@???>
     <userz@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???, himself <usery@???>
 * Cc: unqualified, userx@???, x@???
 C Cc: unqualified@???, userx@???, x@???
diff --git a/test/rejectlog/0536 b/test/rejectlog/0536
index bf06473..71c95f7 100644
--- a/test/rejectlog/0536
+++ b/test/rejectlog/0536
@@ -22,7 +22,8 @@ Envelope-to: <user1@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <user1@???>)
     id 10HmaX-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: user1@???
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -32,7 +33,8 @@ Envelope-to: <user1@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <user2@???>)
     id 10HmaY-0005vi-00
-    for user1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: user2@???
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0539 b/test/rejectlog/0539
index 74da8e6..a9bff02 100644
--- a/test/rejectlog/0539
+++ b/test/rejectlog/0539
@@ -8,7 +8,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0562 b/test/rejectlog/0562
index e404152..555ccc9 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0571 b/test/rejectlog/0571
index 435668e..6f6a397 100644
--- a/test/rejectlog/0571
+++ b/test/rejectlog/0571
@@ -4,7 +4,8 @@ Envelope-to: <ok1@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <ted@???>)
     id 10HmaX-0005vi-00
-    for ok1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for ok1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: ted@???
   Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/0585 b/test/rejectlog/0585
index 993bc45..ef368af 100644
--- a/test/rejectlog/0585
+++ b/test/rejectlog/0585
@@ -4,7 +4,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 T To: b@???, himself <usery@???>
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
@@ -15,7 +16,8 @@ Envelope-to: <userx@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 T To: c@???, himself <usery@???>
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
@@ -27,7 +29,8 @@ Envelope-to: <userx@???>
     <userz@???>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???, himself <UserY@???>
 * Cc: unqualified, UserX@???, x@???
 C Cc: unqualified@???, UserX@???, x@???
diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index e60a0ed..36ff193 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data_defer@???;
+    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@???>)
     id 10HmaY-0005vi-00
-    for data_defer@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data_defer@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Subject: test
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index e60a0ed..36ff193 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data_defer@???;
+    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@???>)
     id 10HmaY-0005vi-00
-    for data_defer@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for data_defer@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Subject: test
 I Message-Id: <E10HmaY-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
diff --git a/test/rejectlog/2500 b/test/rejectlog/2500
index 8c09f15..d985da2 100644
--- a/test/rejectlog/2500
+++ b/test/rejectlog/2500
@@ -4,7 +4,8 @@ Envelope-to: <tainted@???>
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for tainted@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for tainted@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 I Message-Id: <E10HmaX-0005vi-00@???>
 F From: CALLER_NAME <CALLER@???>
   Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -13,7 +14,8 @@ Envelope-from: <>
 Envelope-to: <CALLER@???>
 P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
     id 10HmaY-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@???>
 T To: CALLER@???
diff --git a/test/rejectlog/4000 b/test/rejectlog/4000
index d401a5e..e854db0 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000
 F From: J Caesar <jcaesar@???>
 T To: a-list00@???
diff --git a/test/rejectlog/4006 b/test/rejectlog/4006
index f9626e3..cd090ea 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4007 b/test/rejectlog/4007
index f46e9e7..2eb5c38 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4008 b/test/rejectlog/4008
index 2c4463a..7822719 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4009 b/test/rejectlog/4009
index 5aad096..5709bc3 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4010 b/test/rejectlog/4010
index fbe3b69..ecc0804 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4011 b/test/rejectlog/4011
index 16c7089..15a8594 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4012 b/test/rejectlog/4012
index 8ec883c..1498e32 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4013 b/test/rejectlog/4013
index adeded6..5960c5d 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4014 b/test/rejectlog/4014
index bd26ac2..02d29d2 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4017 b/test/rejectlog/4017
index 670b905..a5e565a 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -17,7 +18,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -29,7 +31,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
@@ -41,7 +44,8 @@ P Received: from CALLER (helo=test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
diff --git a/test/rejectlog/4506 b/test/rejectlog/4506
index 2d843ee..95df33e 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@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    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@???
diff --git a/test/rejectlog/5500 b/test/rejectlog/5500
index 6b2ce92..21b1120 100644
--- a/test/rejectlog/5500
+++ b/test/rejectlog/5500
@@ -6,5 +6,6 @@ Envelope-to: <userp@???>
     <userq@???>
 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@???
diff --git a/test/scripts/0000-Basic/0904 b/test/scripts/0000-Basic/0904
index 9f09a84..270a116 100644
--- a/test/scripts/0000-Basic/0904
+++ b/test/scripts/0000-Basic/0904
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK
 QUIT
 225 OK
@@ -41,8 +41,8 @@ MAIL FROM
 250 good mail cmd
 RCPT TO
 250 acceptable rcpt cmd
-BDAT 329 LAST
-*data 330
+BDAT 331 LAST
+*data 332
 250 OK got that data
 QUIT
 225 OK quitting
@@ -71,8 +71,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 328
+BDAT 331 LAST
+*data 330
 250 OK
 QUIT
 225 OK
@@ -99,8 +99,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 500 oops
 QUIT
 225 OK
@@ -127,8 +127,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 400 not right now
 QUIT
 225 OK
@@ -184,8 +184,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -219,8 +219,8 @@ QUIT
 #250 CHUNKING
 #MAIL FROM
 #RCPT TO
-#BDAT 329 LAST
-#*data 330
+#BDAT 331 LAST
+#*data 332
 #250 good mail cmd
 #****
 #sudo exim -odf -bS
@@ -246,8 +246,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 328
+BDAT 331 LAST
+*data 330
 250 OK mail
 250 OK rcpt
 250 OK bdat
@@ -277,8 +277,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -306,8 +306,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 330 LAST
-*data 330
+BDAT 332 LAST
+*data 332
 450 greylisted mail-from
 550 rcpt ungood lacking mail-from
 500 bdat ungood lacking mail-from
@@ -335,8 +335,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 550 no such recipient
 500 oops bdat
@@ -364,8 +364,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 500 oops bdat
@@ -393,8 +393,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 329 LAST
-*data 329
+BDAT 331 LAST
+*data 331
 250 OK mail
 250 OK rcpt
 400 not right now bdat
diff --git a/test/scripts/0000-Basic/0905 b/test/scripts/0000-Basic/0905
index dcad544..5ec145e 100644
--- a/test/scripts/0000-Basic/0905
+++ b/test/scripts/0000-Basic/0905
@@ -12,8 +12,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -134,8 +134,8 @@ MAIL FROM
 250 OK
 RCPT TO
 250 OK
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 500 oops bdat-nonlast
 QUIT
 225 OK
@@ -255,10 +255,10 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
+BDAT 297
 250 OK mail
 250 OK rcpt
-*data 295
+*data 297
 250 OK nonlast bdat
 BDAT 8380 LAST
 *data 8380
@@ -380,8 +380,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
 500 bdat (nonlast) ungood lacking mail-from
@@ -498,8 +498,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 550 no such recipient
 500 oops nonlast bdat - no rcpt
@@ -617,8 +617,8 @@ EHLO
 MAIL FROM
 RCPT TO
 RCPT TO
-BDAT 279
-*data 279
+BDAT 281
+*data 281
 250 OK mail
 550 no such recipient
 250 good recipient
@@ -740,8 +740,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 500 oops nonlast bdat
@@ -858,8 +858,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 250 OK nonlast bdat
@@ -979,8 +979,8 @@ EHLO
 250 CHUNKING
 MAIL FROM
 RCPT TO
-BDAT 295
-*data 295
+BDAT 297
+*data 297
 250 OK mail
 250 OK rcpt
 400 oops nonlast bdat
@@ -1103,8 +1103,8 @@ BDAT 8191
 250 OK rcpt
 *data 8191
 250 OK nonlast bdat
-BDAT 807 LAST
-*data 807
+BDAT 809 LAST
+*data 809
 250 OK bdat
 QUIT
 225 OK
diff --git a/test/scripts/0000-Basic/0911 b/test/scripts/0000-Basic/0911
index c697989..39b7f00 100644
--- a/test/scripts/0000-Basic/0911
+++ b/test/scripts/0000-Basic/0911
@@ -11,10 +11,10 @@ EHLO
 250 OK
 MAIL FROM
 RCPT TO
-BDAT 313 LAST
+BDAT 315 LAST
 250 OK mail
 250 OK rcpt
-*data 313
+*data 315
 QUIT
 250 OK chunked message data
 221 Closing connection
@@ -39,8 +39,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 315 LAST
-*data 315
+BDAT 317 LAST
+*data 317
 250 OK chunked message data
 QUIT
 221 Closing connection
@@ -68,8 +68,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 321 LAST
+*data 321
 QUIT
 451 Service not available
 221 Closing connection
@@ -98,8 +98,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 319 LAST
-*data 319
+BDAT 321 LAST
+*data 321
 QUIT
 550 content rejected
 221 Closing connection
@@ -126,8 +126,8 @@ MAIL FROM
 250 OK mail
 RCPT TO
 250 OK rcpt
-BDAT 317 LAST
-*data 317
+BDAT 319 LAST
+*data 319

>*eof

 ****
 sudo exim -d-all+transport -odi -bs
diff --git a/test/scripts/4000-scanning/4003 b/test/scripts/4000-scanning/4003
index d9849c3..1f4917d 100644
--- a/test/scripts/4000-scanning/4003
+++ b/test/scripts/4000-scanning/4003
@@ -20,6 +20,7 @@ server 7833
 <    (envelope
 <    id
 <    for
+<    
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -80,6 +81,7 @@ server 7833
 <    (envelope
 <    id
 <    for
+<    
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -138,6 +140,7 @@ server -i 2 7833
 <    (envelope
 <    id
 <    for
+<    
 <Content-type: text/plain
 <Message-Id:
 <From:
@@ -197,6 +200,7 @@ server 7833
 <    (envelope
 <    id
 <    for
+<    
 <Content-type: text/plain
 <Message-Id:
 <From:
diff --git a/test/scripts/4000-scanning/4004 b/test/scripts/4000-scanning/4004
index e5a7c94..72e77a0 100644
--- a/test/scripts/4000-scanning/4004
+++ b/test/scripts/4000-scanning/4004
@@ -22,6 +22,7 @@ server 11333
 <    (envelope
 <    id
 <    for
+<    
 <From:
 <Content-type: text/plain
 <Message-Id:
diff --git a/test/scripts/4006_scan_clamd/4006 b/test/scripts/4006_scan_clamd/4006
index 91d08bd..db5039f 100644
--- a/test/scripts/4006_scan_clamd/4006
+++ b/test/scripts/4006_scan_clamd/4006
@@ -148,6 +148,7 @@ server PORT_D
 <\x09(envelope-from <
 <\x09id
 <\x09for userx@???;
+<\x09
 <Date:
 <Subject: message should be accepted
 <Message-Id: <
diff --git a/test/scripts/4015-scan-ipv6/4015 b/test/scripts/4015-scan-ipv6/4015
index 9e4a857..b341212 100644
--- a/test/scripts/4015-scan-ipv6/4015
+++ b/test/scripts/4015-scan-ipv6/4015
@@ -15,6 +15,7 @@ server 7833
 <    (envelope
 <    id
 <    for
+<    
 <Content-type: text/plain
 <Message-Id:
 <From:
diff --git a/test/scripts/5500-PRDR/5591 b/test/scripts/5500-PRDR/5591
index cf2af61..1ab7488 100644
--- a/test/scripts/5500-PRDR/5591
+++ b/test/scripts/5500-PRDR/5591
@@ -16,8 +16,8 @@ RCPT TO
 250 OK
 RCPT TO
 250 OK
-BDAT 285 LAST
-*data 285
+BDAT 287 LAST
+*data 287
 353 prdr responses coming up
 250 first rcpt was good
 250 second rcpt was good
diff --git a/test/scripts/5800-DANE/5800 b/test/scripts/5800-DANE/5800
index 98a70c1..7b74fc1 100644
--- a/test/scripts/5800-DANE/5800
+++ b/test/scripts/5800-DANE/5800
@@ -1,4 +1,4 @@
-# Expansion test for DANE.
+# Expansion test for DANE
 #
 # Some systems seem to use 1-byte fields for the leading
 # 3 fields in a TLSA record, others 2-bytes.
diff --git a/test/stderr/0022 b/test/stderr/0022
index 510c549..dc0e125 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for warn_empty@???;
+    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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for warn_log@???;
+    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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for warn_user@???;
+    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 5c6e9a9..399c66c 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@???>)
     id 10HmaX-0005vi-00
-    for postmaster@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for postmaster@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= postmaster@??? 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 f572148..4f0c65b 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 4e27129..5a1188c 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/0278 b/test/stderr/0278
index 4ea1cf3..727a6b8 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@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <CALLER@???> 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@??? 
diff --git a/test/stderr/0294 b/test/stderr/0294
index cd0424e..c2ffd2d 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 5af9bac..72ff9e1 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 71d883d..85ee274 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@???>)
-    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@???>)
-    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 1eb9485..e77090a 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@???>)
     id 10HmaY-0005vi-00
-    for kilos@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for kilos@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <kilos@???> 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@??? 
diff --git a/test/stderr/0371 b/test/stderr/0371
index d24df68..d018229 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 f625344..545cf35 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 939aba1..95484cc 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    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 865bf34..3b47d10 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@???>)
-    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 939c7f4..e57c974 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/0404 b/test/stderr/0404
index cf57c90..d27d1c5 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
@@ -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@???> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 DSN: **** SPOOL_OUT - address: <sender@???> 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 1b55f03..02a6cfe 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/0465 b/test/stderr/0465
index 3f4af98..bef0e02 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 ba94bd7..76b9b4a 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@???>)
     id 10HmaX-0005vi-00
-    for r1@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for r1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <r1@???> 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@???>)
     id 10HmaY-0005vi-00
-    for r2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for r2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <r2@???> 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@???>)
     id 10HmaZ-0005vi-00
-    for r3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for r3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 DSN: **** SPOOL_OUT - address: <r3@???> 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 277fba6..e593616 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/0489 b/test/stderr/0489
index 9a00fed..ef3c01c 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@???>)
     id 10HmaX-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmaY-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmaZ-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmbA-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmbB-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmbC-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmbD-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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@???>)
     id 10HmbE-0005vi-00
-    for X@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for X@???;
+    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 7e6ac1c..845b2c3 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 6a6645d..9ea7f1f 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@???
   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 e046340..869198a 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/2610 b/test/stderr/2610
index 7a430b6..73812a2 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@???>)
     id 10HmaX-0005vi-00
-    for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for ph10@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <ph10@???> 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@??? 
diff --git a/test/stderr/2620 b/test/stderr/2620
index 2894712..5a4cbb3 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@???>)
     id 10HmaX-0005vi-00
-    for CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <CALLER@???> 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@??? 
diff --git a/test/stderr/5004 b/test/stderr/5004
index 56ae012..1cd68d1 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/5005 b/test/stderr/5005
index c018546..47852e4 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@???>)
     id 10HmaX-0005vi-00
-    for nofile@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nofile@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <nofile@???> 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@??? 
@@ -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@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
@@ -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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
@@ -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@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stderr/5006 b/test/stderr/5006
index 250352f..21959bb 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
 DSN: **** SPOOL_OUT - address: <userx@???> 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@??? 
diff --git a/test/stdout/0015 b/test/stdout/0015
index d82e3cb..1949f38 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@???>)
     id 10HmbE-0005vi-00
-    for S+userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for S+userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbG-0005vi-00
-    for Userx-S@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for Userx-S@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0033 b/test/stdout/0033
index 82aa1e9..0ad42d5 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@???>)
     id 10HmaX-0005vi-00
-    for list@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for list@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for list@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0035 b/test/stdout/0035
index 94b08fc..2a2bc28 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@???>
 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@???>
 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@???
 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@???
 047I Message-Id: <E10HmbB-0005vi-00@???>
 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@???
 047I Message-Id: <E10HmbC-0005vi-00@???>
 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@???
 047I Message-Id: <E10HmbD-0005vi-00@???>
 dddF From: SomeName <a@y>
diff --git a/test/stdout/0100 b/test/stdout/0100
index f4c25d7..8eb2367 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@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ..dotheader: This is perfectly legal
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -45,7 +46,8 @@ X-Filtered: just checking
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbM-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ..dotheader: This is perfectly legal
 Message-Id: <E10HmbM-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0101 b/test/stdout/0101
index c5e6a37..7fef0f8 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@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ..dotheader: This is perfectly legal
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0143 b/test/stdout/0143
index 1075fed..91e464e 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0163 b/test/stdout/0163
index 8e88323..fbbc601 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0177 b/test/stdout/0177
index f558f08..df53dd2 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@???>)
     id 10HmbG-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this (3)
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0179 b/test/stdout/0179
index c8db946..79524d8 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for abcd@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abcd@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0185 b/test/stdout/0185
index dba278f..f0dc3d3 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@???>)
     id 10HmaX-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: freeze this
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0190 b/test/stdout/0190
index 756f7f8..1a5c1c2 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0203 b/test/stdout/0203
index b311e11..2a4048e 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0209 b/test/stdout/0209
index 90a59b2..ebb3e5a 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0210 b/test/stdout/0210
index 2eedebd..30ad657 100644
--- a/test/stdout/0210
+++ b/test/stdout/0210
@@ -13,7 +13,8 @@ RCPT TO:<smtp@???>
 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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0215 b/test/stdout/0215
index d6d06cf..a883c1c 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0217 b/test/stdout/0217
index 17ed51b..ab2b72a 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0218 b/test/stdout/0218
index c7f853f..f4680ed 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@???>)
     id 10HmaX-0005vi-00
-    for a@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for a@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for b@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for b@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbC-0005vi-00
-    for c@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for c@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0231 b/test/stdout/0231
index f74359c..5f88975 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@???>)
-    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@???, b@???, a-rewrite@domain2,
     b-rewrite@domain2, a@domain3, b@domain3
 To:       a@???, b@???, a-other@domain2,
diff --git a/test/stdout/0242 b/test/stdout/0242
index 7dc9a2e..7538894 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@???>)
     id 10HmaX-0005vi-00
-    for abc@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abc@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for abc@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for abc@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test message
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0245 b/test/stdout/0245
index da28e7e..f3b1a39 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@???>)
-    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 d4d7237..c433281 100644
--- a/test/stdout/0250
+++ b/test/stdout/0250
@@ -21,7 +21,8 @@ SomeOne-rewritten@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER-rewritten@???>)
     id 10HmaX-0005vi-00
-    for SomeOne-rewritten@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for SomeOne-rewritten@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ddd* From: userx@???
 dddF From: userx-rewritten@???
 047I Message-Id: <E10HmaX-0005vi-00@???>
@@ -53,7 +54,8 @@ OtherOne-rewritten@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER-rewritten@???>)
     id 10HmaY-0005vi-00
-    for OtherOne-rewritten@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for OtherOne-rewritten@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 ddd* From: usery@???
 dddF From: usery-rewritten@???
 047I Message-Id: <E10HmaY-0005vi-00@???>
@@ -85,7 +87,8 @@ ThirdOne-rewritten@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER-rewritten@???>)
     id 10HmaZ-0005vi-00
-    for ThirdOne-rewritten@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for ThirdOne-rewritten@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaZ-0005vi-00@???>
 ddd* X-rewrote-original-recipient: ThirdOne@???
 ddd* From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0253 b/test/stdout/0253
index e289e81..b0544c8 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@???>)
-    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@???>
 From: pqr@???
 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@???>)
-    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@???>
 From: pqr@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0254 b/test/stdout/0254
index 1fcd3fd..3897ce3 100644
--- a/test/stdout/0254
+++ b/test/stdout/0254
@@ -21,7 +21,8 @@ userx@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 054I Resent-Message-Id: <E10HmaX-0005vi-00@???>
 ddd* From: f
 dddF From: f@???
@@ -59,7 +60,8 @@ userx@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
 ddd* From: f
@@ -90,7 +92,8 @@ userx@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    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@???>
 ddd* From: userx
diff --git a/test/stdout/0285 b/test/stdout/0285
index 37a681a..256a650 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0286 b/test/stdout/0286
index e0a34b3..ea7e87e 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0288 b/test/stdout/0288
index 3eab9df..d7a6e18 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0299 b/test/stdout/0299
index 798f402..20d32d7 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0311 b/test/stdout/0311
index a26b24c..b77eaf0 100644
--- a/test/stdout/0311
+++ b/test/stdout/0311
@@ -21,7 +21,8 @@ xx@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for xx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for xx@???;
+    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@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for xx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for xx@???;
+    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 d1593fa..648b56e 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@???>)
     id 10HmaX-0005vi-00
-    for ok@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for ok@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0333 b/test/stdout/0333
index d1593fa..648b56e 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@???>)
     id 10HmaX-0005vi-00
-    for ok@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for ok@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0338 b/test/stdout/0338
index 06aab63..7be3229 100644
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -26,7 +26,8 @@ a1-userx@???  0,0 postmaster@??? 18,0#3
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0363 b/test/stdout/0363
index a316069..d7fefbf 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0367 b/test/stdout/0367
index b54aff8..3a592d2 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0374 b/test/stdout/0374
index f9844eb..16089d2 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0375 b/test/stdout/0375
index 6e0080d..c8139f8 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0377 b/test/stdout/0377
index f6d8fc6..e09e549 100644
--- a/test/stdout/0377
+++ b/test/stdout/0377
@@ -23,7 +23,8 @@ cccc@???


 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0378 b/test/stdout/0378
index e163ed1..0f2367a 100644
--- a/test/stdout/0378
+++ b/test/stdout/0378
@@ -22,7 +22,8 @@ aaaa@???
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for aaaa@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for aaaa@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0379 b/test/stdout/0379
index d3bd25e..7321f4e 100644
--- a/test/stdout/0379
+++ b/test/stdout/0379
@@ -22,7 +22,8 @@ aaaa@???


 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0389 b/test/stdout/0389
index 758f261..4984942 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@???>)
     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@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0431 b/test/stdout/0431
index 5e17ec9..b21aff2 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0440 b/test/stdout/0440
index 7433e27..22057e9 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0461 b/test/stdout/0461
index 16c0f34..b610cba 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0467 b/test/stdout/0467
index 553dda8..c389154 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@???>)
     id 10HmaZ-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0474 b/test/stdout/0474
index f00a7d8..78f2f82 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0488 b/test/stdout/0488
index 680def4..6b0b1c6 100644
--- a/test/stdout/0488
+++ b/test/stdout/0488
@@ -26,7 +26,8 @@ userx@???
 dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0490 b/test/stdout/0490
index cc71d26..fb456ca 100644
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -30,7 +30,8 @@ bb@???
 dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
-    for bb@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for bb@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaY-0005vi-00@???>
 dddF From: CALLER_NAME <CALLER@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0495 b/test/stdout/0495
index 5c48151..d445ac0 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>
 From: sen@der
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0497 b/test/stdout/0497
index e179e58..0cc6992 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@???>)
     id 10HmbD-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbL-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbL-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0498 b/test/stdout/0498
index 61a27be..bd4bdf9 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0514 b/test/stdout/0514
index 913378a..4e85fa6 100644
--- a/test/stdout/0514
+++ b/test/stdout/0514
@@ -24,7 +24,8 @@ userx@???
 dddP Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
     (envelope-from <"spaced user"@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 047I Message-Id: <E10HmaX-0005vi-00@???>
 dddF From: CALLER_NAME <"spaced user"@???>
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0531 b/test/stdout/0531
index 9691d20..e4d0d9c 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0543 b/test/stdout/0543
index 6b6a606..6c82e87 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0554 b/test/stdout/0554
index cb37171..540a506 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0560 b/test/stdout/0560
index 45a84cf..2423d16 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 From: Somebody <abcd@???>
 To: first@???
     another@???
diff --git a/test/stdout/0565 b/test/stdout/0565
index be4e455..5433ba4 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@???>)
     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@???>)
     id 10HmaY-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    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 7dbc7d2..5d3d0bd 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@???>)
     id 10HmaX-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -87,7 +88,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -126,7 +128,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -153,7 +156,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -178,7 +182,8 @@ DATA
 354 hit me
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/0616 b/test/stdout/0616
index 369cf7f..2cc574f 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0617 b/test/stdout/0617
index 369cf7f..2cc574f 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0623 b/test/stdout/0623
index 1c571c9..4a156de 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@???>)
     id 10HmaX-0005vi-00
-    for good@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for good@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for nopipe@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nopipe@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for tempreject@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for tempreject@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbA-0005vi-00
-    for permreject@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for permreject@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbB-0005vi-00
-    for permreject@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for permreject@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0904 b/test/stdout/0904
index 6df7891..52f93b9 100644
--- a/test/stdout/0904
+++ b/test/stdout/0904
@@ -10,7 +10,7 @@ MAIL FROM:<>
 250 OK
 RCPT TO:<a@???>
 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@???>
 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@???>
 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@???>
250 OK
-BDAT 329 LAST
+BDAT 331 LAST
500 oops
QUIT
225 OK
@@ -68,7 +68,7 @@ MAIL FROM:<>
250 OK
RCPT TO:<e@???>
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@???>
-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@???>
-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@???>
-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@???>
-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@???>
-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@???>
-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@???>
-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 5d4a011..cb553e1 100644
--- a/test/stdout/0905
+++ b/test/stdout/0905
@@ -10,7 +10,7 @@ MAIL FROM:<>
250 OK
RCPT TO:<a@???>
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@???>
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@???>
-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@???>
-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@???>
-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@???>
RCPT TO:<t2@???>
-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@???>
-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@???>
-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@???>
-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 92db28b..b49d165 100644
--- a/test/stdout/0911
+++ b/test/stdout/0911
@@ -47,7 +47,7 @@ EHLO myhost.test.ex
250 OK
MAIL FROM:<>
RCPT TO:<good@???>
-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@???>
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@???>
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@???>
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@???>
250 OK rcpt
-BDAT 317 LAST
+BDAT 319 LAST
>*eof

 End of script
diff --git a/test/stdout/1161 b/test/stdout/1161
index fad9166..ea43216 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3401 b/test/stdout/3401
index fda6814..4de91c2 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbF-0005vi-00
-    for forcesender@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for forcesender@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbI-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3404 b/test/stdout/3404
index c78436c..7a5a1c3 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3405 b/test/stdout/3405
index 6020e05..d90cd69 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3412 b/test/stdout/3412
index 80a4e1b..d6eebaf 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for CALLER@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: x@???
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@???>
@@ -56,7 +57,8 @@ Return-path: <CALLER@???>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
-    for x@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for x@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/3415 b/test/stdout/3415
index 7c6e90b..0ce6f19 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@???>)
     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@???>
 dddF From: a@y
 dddS Sender: username@???
@@ -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@???>
 dddF From: username@???
 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@???>
 dddF From: username@???
 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@???>
 dddF From: username@???
 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@???
 047I Message-Id: <E10HmbB-0005vi-00@???>
 dddS Sender: username@???
diff --git a/test/stdout/3501 b/test/stdout/3501
index e29d425..0ec27c8 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4003 b/test/stdout/4003
index 5c16c63..f0a931b 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@???>)
 <    id 10HmaX-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@???>
 <From: fromuser@???
@@ -101,7 +102,8 @@ Connection request from [127.0.0.1]
 <    by myhost.test.ex with local-esmtp (Exim x.yz)
 <    (envelope-from <fromuser@???>)
 <    id 10HmaY-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaY-0005vi-00@???>
 <From: fromuser@???
@@ -146,7 +148,8 @@ Connection request from [127.0.0.1]
 <    by myhost.test.ex with local-esmtp (Exim x.yz)
 <    (envelope-from <fromuser@???>)
 <    id 10HmaZ-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaZ-0005vi-00@???>
 <From: fromuser@???
@@ -190,7 +193,8 @@ Connection request from [127.0.0.1]
 <    by myhost.test.ex with local-esmtp (Exim x.yz)
 <    (envelope-from <fromuser@???>)
 <    id 10HmbA-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmbA-0005vi-00@???>
 <From: fromuser@???
diff --git a/test/stdout/4004 b/test/stdout/4004
index afff4e4..021f5a3 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@???>)
 <    id 10HmaX-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    Tue, 2 Mar 1999 09:44:33 +0000
 <From: MAILER_DAEMON <>
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@???>
diff --git a/test/stdout/4006 b/test/stdout/4006
index b4a72b8..480b558 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@???>)
 <    id 10HmbD-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    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@???>
diff --git a/test/stdout/4015 b/test/stdout/4015
index 7e1d83e..0e85301 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@???>
@@ -24,7 +24,8 @@ Connection request from [127.0.0.1]
 <    by myhost.test.ex with local-esmtp (Exim x.yz)
 <    (envelope-from <fromuser@???>)
 <    id 10HmaX-0005vi-00
-<    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+<    for userx@???;
+<    Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
 <Message-Id: <E10HmaX-0005vi-00@???>
 <From: fromuser@???
diff --git a/test/stdout/4052 b/test/stdout/4052
index 2f2fdc8..c84be25 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@???>)
     id 10HmbD-0005vi-00
-    for nocache2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nocache2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbE-0005vi-00
-    for withcache2@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for withcache2@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbG-0005vi-00
-    for nocache3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for nocache3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbH-0005vi-00
-    for withcache3@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for withcache3@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbO-0005vi-00
-    for withcache23@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for withcache23@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbO-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbP-0005vi-00
-    for extchange@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for extchange@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbP-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4711 b/test/stdout/4711
index 78b5203..0a5c65d 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4712 b/test/stdout/4712
index 69be8af..56cd857 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4713 b/test/stdout/4713
index 02b10ea..ac4fc02 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/4714 b/test/stdout/4714
index f7d8e22..207e19a 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -30,7 +31,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -46,7 +48,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -62,7 +65,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -78,7 +82,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
@@ -103,7 +108,8 @@ DATA
 352 go ahead
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
     (envelope-from <CALLER@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/5102 b/test/stdout/5102
index 3720192..76c2ec6 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5400 b/test/stdout/5400
index 9fae04f..1790e18 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for userz@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userz@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbA-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 X-hdr-tpt: zzz
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
@@ -265,7 +269,8 @@ Received: from CALLER (helo=myhost.test.ex)
     by myhost.test.ex with local-esmtp (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbC-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbH-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: singledot test
 Message-Id: <E10HmbH-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/5401 b/test/stdout/5401
index c0089f8..52f8d7a 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5402 b/test/stdout/5402
index 1aa5596..629aa43 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@???>)
     id 10HmaX-0005vi-00
-    for dest@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for dest@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5404 b/test/stdout/5404
index aa2bdca..fc5058a 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5405 b/test/stdout/5405
index ef39477..b78f2bc 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@???>)
     id 10HmaX-0005vi-00
-    for usera@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usera@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbA-0005vi-00
-    for usere@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usere@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbB-0005vi-00
-    for userf@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userf@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbC-0005vi-00
-    for userg@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userg@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbE-0005vi-00
-    for userj@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userj@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmbD-0005vi-00
-    for userh@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userh@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5406 b/test/stdout/5406
index 773c25d..e372141 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaY-0005vi-00
-    for usery@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for usery@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     id 10HmaZ-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5407 b/test/stdout/5407
index 90ae013..d67b362 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@???>)
-    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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5409 b/test/stdout/5409
index a582bb8..e7edb25 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@???>)
     id 10HmaX-0005vi-00
-    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for userx@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Subject: test
 Message-Id: <E10HmaX-0005vi-00@???>
 From: CALLER_NAME <CALLER@???>
diff --git a/test/stdout/5510 b/test/stdout/5510
index b9eb9db..7d2ad81 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@???>)
-    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@???>
 From: userx@???
 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@???>)
-    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@???>
 From: userx@???
 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@???>)
-    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@???>
 From: userx@???
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -106,7 +109,8 @@ RCPT TO:<userq@???>
 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@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000


@@ -133,7 +137,8 @@ RCPT TO:<user5.2@???>
 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@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000


@@ -162,7 +167,8 @@ RCPT TO:<user6.2@???>
 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@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000


@@ -190,7 +196,8 @@ RCPT TO:<user7.3@???>
 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@???>
 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@???; Tue, 2 Mar 1999 09:44:33 +0000
+    for user8.1@???;
+    Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000


diff --git a/test/stdout/5591 b/test/stdout/5591
index 4794b4a..6d45245 100644
--- a/test/stdout/5591
+++ b/test/stdout/5591
@@ -14,7 +14,7 @@ RCPT TO:<usery@???>
 250 OK
 RCPT TO:<userz@???>
 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 6d897d3..f1ae127 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5702 b/test/stdout/5702
index de07377..09fd602 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@???>)
     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@???>
 From: CALLER_NAME <CALLER@???>
 Date: Tue, 2 Mar 1999 09:44:33 +0000