This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=4ba094cd136becc8ad41bb7a98ffccec5e48d59b

The branch, master has been updated
       via  4ba094cd136becc8ad41bb7a98ffccec5e48d59b (commit)
      from  3fb87f63f3dc9dbbcf3cecc2a9ef2c85bd007204 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ba094cd136becc8ad41bb7a98ffccec5e48d59b
Author: Sergey Poznyakoff <[email protected]>
Date:   Fri Nov 12 23:08:54 2010 +0200

    Minor fix in the test suite.
    
    Replace 'Mirddin.farlep.net' with 'example.net' throughout the
    testsuite.  Change expected message/part sizes accordingly.
    Files changed:
    
    * imap4d/testsuite/imap4d/fetch.exp
    * mail/testsuite/mail/folder.exp
    * mail/testsuite/mail/read.exp
    * mail/testsuite/mail/write.exp
    * mh/tests/scan.at
    * readmsg/tests/all.at
    * testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
    * testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
    * testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
    * testsuite/mh/mbox1/3
    * testsuite/mh/mbox1/4
    * testsuite/mh/mbox1/5
    * testsuite/mime.at
    * testsuite/spool/mbox
    * testsuite/spool/mbox1
    * testsuite/spool/relational.mbox

-----------------------------------------------------------------------

Summary of changes:
 imap4d/testsuite/imap4d/fetch.exp                  |   38 ++++++------
 mail/testsuite/mail/folder.exp                     |    2 +-
 mail/testsuite/mail/read.exp                       |   38 ++++++------
 mail/testsuite/mail/write.exp                      |   20 +++---
 mh/tests/scan.at                                   |   12 ++--
 readmsg/tests/all.at                               |   26 ++++----
 .../mbox1/new/1284628225.M20118P3883Q2.Trurl       |   18 +++---
 .../mbox1/new/1284628225.M21284P3883Q3.Trurl       |   26 ++++----
 .../mbox1/new/1284628225.M22502P3883Q4.Trurl       |   18 +++---
 testsuite/mh/mbox1/3                               |   18 +++---
 testsuite/mh/mbox1/4                               |   26 ++++----
 testsuite/mh/mbox1/5                               |   18 +++---
 testsuite/mime.at                                  |   32 +++++-----
 testsuite/spool/mbox                               |   12 ++--
 testsuite/spool/mbox1                              |   62 ++++++++++----------
 testsuite/spool/relational.mbox                    |    8 +-
 16 files changed, 187 insertions(+), 187 deletions(-)

diff --git a/imap4d/testsuite/imap4d/fetch.exp 
b/imap4d/testsuite/imap4d/fetch.exp
index dc04bf3..4c3db23 100644
--- a/imap4d/testsuite/imap4d/fetch.exp
+++ b/imap4d/testsuite/imap4d/fetch.exp
@@ -67,9 +67,9 @@ imap4d_test "FETCH 3 (FLAGS INTERNALDATE UID)"\
 imap4d_test "FETCH 1:* ENVELOPE"\
 "1 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" 
((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) 
((\"Bar\" NIL \"bar\" \"dontmailme.org\")) NIL NIL NIL 
\"<[email protected]>\"))"\
 "2 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" 
((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" 
\"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" 
NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
-"3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
-"4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
-"5 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
+"3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" 
NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" 
\"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL 
NIL \"<[email protected]>\"))"\
+"4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" 
NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" 
\"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL 
NIL \"<[email protected]>\"))"\
+"5 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" 
NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" 
\"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL 
NIL \"<[email protected]>\"))"\
 "OK"
 
 # ALL            Macro equivalent to: (FLAGS INTERNALDATE
@@ -78,9 +78,9 @@ imap4d_test "FETCH 1:* ENVELOPE"\
 imap4d_test "FETCH 1:\* ALL"\
 "1 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 22:18:09 +0000\" 
RFC822.SIZE 1298 ENVELOPE (\"Fri, 28 Dec 2001 22:18:08 +0200\" \"Jabberwocky\" 
((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) 
((\"Bar\" NIL \"bar\" \"dontmailme.org\")) NIL NIL NIL 
\"<[email protected]>\"))"\
 "2 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:28:09 +0000\" 
RFC822.SIZE 547 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: 
Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" 
\"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" 
NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
-"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" 
RFC822.SIZE 1667 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
-"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" 
RFC822.SIZE 3567 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
-"5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" 
RFC822.SIZE 940 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME 
Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\"))"\
+"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" 
RFC822.SIZE 1611 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" 
NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" 
\"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL 
NIL \"<[email protected]>\"))"\
+"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" 
RFC822.SIZE 3483 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" 
NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" 
\"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL 
NIL \"<[email protected]>\"))"\
+"5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" 
RFC822.SIZE 884 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME 
Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) 
NIL NIL NIL \"<[email protected]>\"))"\
 "OK"
 
 # BODYSTRUCTURE  The [MIME-IMB] body structure of the message.  This
@@ -97,24 +97,24 @@ imap4d_test "FETCH 2 BODYSTRUCTURE"\
 "OK"
 
 imap4d_test "FETCH 3 BODYSTRUCTURE"\
-"3 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"How doth\" \"7BIT\" 
239 9 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") 
\"<[email protected]>\" \"Father William Part I\" \"base64\" 
468 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
+"3 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"How doth\" \"7BIT\" 239 9 
NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") 
\"<[email protected]>\" \"Father William Part I\" \"base64\" 468 
NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
 "OK"
 
 imap4d_test "FETCH 4 BODYSTRUCTURE"\
-"4 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Father William Part 
I\" \"7BIT\" 351 10 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" 
\"msg.22\") \"<[email protected]>\" \"Father William Part 
II\" \"base64\" 486 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" 
\"msg.23\") \"<[email protected]>\" \"Father William Part 
III\" \"base64\" 490 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" 
\"msg.24\") \"<[email protected]>\" \"Father William Part 
IV\" \"base64\" 502 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- 
=_aaaaaaaaaa2\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa1\") NIL 
NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
+"4 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Father William Part I\" 
\"7BIT\" 351 10 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" 
\"msg.22\") \"<[email protected]>\" \"Father William Part II\" 
\"base64\" 486 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" 
\"msg.23\") \"<[email protected]>\" \"Father William Part III\" 
\"base64\" 490 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" 
\"msg.24\") \"<[email protected]>\" \"Father William Part IV\" 
\"base64\" 502 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa2\") 
NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa1\") NIL NIL) \"mixed\" 
(\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
 "OK"
 
 imap4d_test "FETCH 5 BODYSTRUCTURE"\
-"5 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Empty part\" 
\"7BIT\" 0 0 NIL NIL NIL)(\"text\" \"plain\" (\"name\" \"single.line\" 
\"charset\" \"us-ascii\") \"<[email protected]>\" \"Single 
line part\" \"7BIT\" 2 1 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- 
=_aaaaaaaaaa0\") NIL NIL))"\
+"5 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Empty part\" \"7BIT\" 0 0 
NIL NIL NIL)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Single line part\" \"7BIT\" 
2 1 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
 "OK" 
 
 # BODY       The text of a particular body section. 
 imap4d_test "FETCH 1:* BODY"\
 "1 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 
972 35))"\
 "2 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 
219 4))"\
-"3 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"How doth\" \"7BIT\" 
239 9)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") 
\"<[email protected]>\" \"Father William Part I\" \"base64\" 
468) \"mixed\" NIL NIL NIL))"\
-"4 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Father William Part 
I\" \"7BIT\" 351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") 
\"<[email protected]>\" \"Father William Part II\" 
\"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") 
\"<[email protected]>\" \"Father William Part III\" 
\"base64\" 490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") 
\"<[email protected]>\" \"Father William Part IV\" 
\"base64\" 502) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL 
NIL))"\
-"5 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Empty part\" 
\"7BIT\" 0 0)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Single line part\" 
\"7BIT\" 2 1) \"mixed\" NIL NIL NIL))"\
+"3 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"How doth\" \"7BIT\" 239 
9)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") 
\"<[email protected]>\" \"Father William Part I\" \"base64\" 468) 
\"mixed\" NIL NIL NIL))"\
+"4 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Father William Part I\" 
\"7BIT\" 351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") 
\"<[email protected]>\" \"Father William Part II\" \"base64\" 
486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") 
\"<[email protected]>\" \"Father William Part III\" \"base64\" 
490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") 
\"<[email protected]>\" \"Father William Part IV\" \"base64\" 502) 
\"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
+"5 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" 
\"us-ascii\") \"<[email protected]>\" \"Empty part\" \"7BIT\" 0 
0)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"us-ascii\") 
\"<[email protected]>\" \"Single line part\" \"7BIT\" 2 1) 
\"mixed\" NIL NIL NIL))"\
 "OK"
 
 # BODY.PEEK[<section>]<<partial>>
@@ -318,10 +318,10 @@ imap4d_test "FETCH 1 BODY\[TEXT\]<0.4000>"\
 # more numeric part specifiers.
 
 imap4d_test "FETCH 3 BODY\[1.MIME\]"\
-"3 FETCH (FLAGS (\\Seen) BODY\[1.MIME\] {145}"\
+"3 FETCH (FLAGS (\\Seen) BODY\[1.MIME\] {138}"\
 -literal\
 "Content-Type: text/plain; name=\"msg.1\"; charset=\"us-ascii\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: How doth"\
 ""\
 ")"\
@@ -354,11 +354,11 @@ imap4d_test "FETCH 4 BODY\[2.2.1.TEXT\]"\
 "OK"
 
 imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\
-"4 FETCH (BODY\[2.2.TEXT\] {1446}"\
+"4 FETCH (BODY\[2.2.TEXT\] {1432}"\
 -literal\
 -- "------- =_aaaaaaaaaa2"\
 "Content-Type: application/octet-stream; name=\"msg.23\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part III"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -372,7 +372,7 @@ imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\
 ""\
 -- "------- =_aaaaaaaaaa2"\
 "Content-Type: application/octet-stream; name=\"msg.24\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part IV"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -488,7 +488,7 @@ imap4d_test "FETCH 2 RFC822.HEADER"\
 # RFC822.SIZE    The [RFC-822] size of the message.
 
 imap4d_test "FETCH 3 RFC822.SIZE"\
-"3 FETCH (RFC822.SIZE 1667)"\
+"3 FETCH (RFC822.SIZE 1611)"\
 "OK"
 
 # RFC822.TEXT    Functionally equivalent to BODY[TEXT], differing in
@@ -515,7 +515,7 @@ imap4d_test "FETCH 1 FAST" \
 #                RFC822.SIZE ENVELOPE BODY)
 
 imap4d_test "FETCH 4 FULL"\
-"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" 
RFC822.SIZE 3567 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey 
Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL 
\"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" 
\"nonexistent.net\")) NIL NIL NIL 
\"<[email protected]>\") BODY ((\"text\" \"plain\" 
(\"name\" \"msg.21\" \"charset\" \"us-ascii\") 
\"<[email protected]>\" \"Father William Part I\" \"7BIT\" 
351 10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") 
\"<[email protected]>\" \"Father William Part II\" 
\"base64\" 486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") 
\"<[email protected]>\" \"Father William Part III\" 
\"base64\" 490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") 
\"<[email protected]>\" \"Father William Part IV\" 
\"base64\" 502) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL 
NIL))"\
+"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" 
RFC822.SIZE 3483 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" 
((\"Sergey Poznyakoff\" NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" 
NIL \"gray\" \"example.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" 
\"example.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL 
NIL \"<[email protected]>\") BODY ((\"text\" \"plain\" 
(\"name\" \"msg.21\" \"charset\" \"us-ascii\") 
\"<[email protected]>\" \"Father William Part I\" \"7BIT\" 351 
10)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") 
\"<[email protected]>\" \"Father William Part II\" \"base64\" 
486)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") 
\"<[email protected]>\" \"Father William Part III\" \"base64\" 
490)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") 
\"<[email protected]>\" \"Father William Part IV\" \"base64\" 502) 
\"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
 "OK"
 
 imap4d_stop
diff --git a/mail/testsuite/mail/folder.exp b/mail/testsuite/mail/folder.exp
index 4ddcf06..448385a 100644
--- a/mail/testsuite/mail/folder.exp
+++ b/mail/testsuite/mail/folder.exp
@@ -53,7 +53,7 @@ mail_test "file &" \
 mail_test "sum" \
  "\"$MU_SPOOL_DIR/mbox\": 1 message 1 new"
 mail_test "headers" \
- ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/425   MBOX"   
+ ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX"   
 
 mail_stop
 
diff --git a/mail/testsuite/mail/read.exp b/mail/testsuite/mail/read.exp
index 7e02fe5..61f6379 100644
--- a/mail/testsuite/mail/read.exp
+++ b/mail/testsuite/mail/read.exp
@@ -27,16 +27,16 @@ mail_command "set readonly"
 mail_test "size *" \
 "> 1  44/1254 "\
 "  2  13/534  "\
-"  3  42/1625 "\
-"  4  84/3483 "
+"  3  42/1569 "\
+"  4  84/3399 "
 
 ###########################################################################
 # `headers' and `print'
 mail_test "headers" \
 ">N   1 Foo Bar            Fri Dec 28 22:18  44/1254  Jabberwocky" \
 " N   2 Bar                Fri Dec 28 23:28  13/534   Re: Jabberwocky" \
-" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1625  Simple MIME" \
-" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3483  Nested MIME" \
+" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1569  Simple MIME" \
+" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3399  Nested MIME" \
 
 mail_test "print"\
        "Received: (from [email protected])"\
@@ -158,8 +158,8 @@ mail_test -message "top (2)" "top" \
 mail_test -message "headers (2)" "headers" \
 ">R   1 Foo Bar            Fri Dec 28 22:18  44/1254  Jabberwocky" \
 " N   2 Bar                Fri Dec 28 23:28  13/534   Re: Jabberwocky" \
-" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1625  Simple MIME" \
-" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3483  Nested MIME" \
+" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1569  Simple MIME" \
+" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3399  Nested MIME" \
 
 ###########################################################################
 # `next' should display the 2nd message
@@ -185,8 +185,8 @@ mail_test "next" \
 mail_test -message "headers (3)" "headers" \
 " R   1 Foo Bar            Fri Dec 28 22:18  44/1254  Jabberwocky" \
 ">R   2 Bar                Fri Dec 28 23:28  13/534   Re: Jabberwocky" \
-" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1625  Simple MIME" \
-" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3483  Nested MIME" \
+" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1569  Simple MIME" \
+" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3399  Nested MIME" \
 
 ###########################################################################
 # Check for `prev'
@@ -212,8 +212,8 @@ mail_test "prev"\
 mail_test -message "headers (4)" "headers" \
 ">R   1 Foo Bar            Fri Dec 28 22:18  44/1254  Jabberwocky" \
 " R   2 Bar                Fri Dec 28 23:28  13/534   Re: Jabberwocky" \
-" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1625  Simple MIME" \
-" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3483  Nested MIME" \
+" N   3 Sergey Poznyakoff  Sat Jul 13 00:43  42/1569  Simple MIME" \
+" N   4 Sergey Poznyakoff  Sat Jul 13 00:50  84/3399  Nested MIME" \
 
 ###########################################################################
 # print with an argument
@@ -245,7 +245,7 @@ mail_test -message "decoding simple MIME messages" \
 "| Encoding=7bit"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: text/plain; name=\"msg.1\"; charset=\"us-ascii\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: How doth"\
 ""\
 "How doth the little crocodile"\
@@ -263,7 +263,7 @@ mail_test -message "decoding simple MIME messages" \
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.21\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part I"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -285,7 +285,7 @@ mail_test -message "decoding nested MIME messages" \
 "| Encoding=7bit"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: text/plain; name=\"msg.21\"; charset=\"us-ascii\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part I"\
 ""\
 "`You are old, Father William,' the young man said,"\
@@ -304,7 +304,7 @@ mail_test -message "decoding nested MIME messages" \
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.22\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part II"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -323,7 +323,7 @@ mail_test -message "decoding nested MIME messages" \
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.23\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part III"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -342,7 +342,7 @@ mail_test -message "decoding nested MIME messages" \
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.24\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part IV"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -364,7 +364,7 @@ mail_test -message "Addressing parts of a MIME message" \
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.23\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part III"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -386,7 +386,7 @@ mail_test -message "Addressing parts of a MIME message (2)" 
\
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.23\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part III"\
 "Content-Transfer-Encoding: base64"\
 ""\
@@ -405,7 +405,7 @@ mail_test -message "Addressing parts of a MIME message (2)" 
\
 "| Encoding=base64"\
 
"+------------------------------------------------------------------------------+"\
 "Content-Type: application/octet-stream; name=\"msg.24\""\
-"Content-ID: <[email protected]>"\
+"Content-ID: <[email protected]>"\
 "Content-Description: Father William Part IV"\
 "Content-Transfer-Encoding: base64"\
 ""\
diff --git a/mail/testsuite/mail/write.exp b/mail/testsuite/mail/write.exp
index 4743f95..ae420e7 100644
--- a/mail/testsuite/mail/write.exp
+++ b/mail/testsuite/mail/write.exp
@@ -41,15 +41,15 @@ mail_test "delete" "No applicable messages"
 mail_start -reuse-spool "--file=%mbox1"
 mail_test "h" \
        ">U   1 Bar                Fri Dec 28 23:28  16/578   Re: Jabberwocky"\
-       " U   2 Sergey Poznyakoff  Sat Jul 13 00:43  44/1644  Simple MIME"\
-       " U   3 Sergey Poznyakoff  Sat Jul 13 00:43  29/932   Empty MIME Parts"
+       " U   2 Sergey Poznyakoff  Sat Jul 13 00:43  44/1588  Simple MIME"\
+       " U   3 Sergey Poznyakoff  Sat Jul 13 00:43  29/876   Empty MIME Parts"
 
 # Send first message to mbox...
 mail_command "mbox 1"
 mail_test "h" \
        ">M   1 Bar                Fri Dec 28 23:28  16/578   Re: Jabberwocky"\
-       " U   2 Sergey Poznyakoff  Sat Jul 13 00:43  44/1644  Simple MIME"\
-       " U   3 Sergey Poznyakoff  Sat Jul 13 00:43  29/932   Empty MIME Parts"
+       " U   2 Sergey Poznyakoff  Sat Jul 13 00:43  44/1588  Simple MIME"\
+       " U   3 Sergey Poznyakoff  Sat Jul 13 00:43  29/876   Empty MIME Parts"
 
 # ... and quit
 mail_test -noprompt "quit" \
@@ -59,16 +59,16 @@ mail_test -noprompt "quit" \
 # Now check the mbox contents
 mail_start -reuse-spool "--file=%mbox"
 mail_test "headers" \
-       ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/425   MBOX"\
+       ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX"\
        " U   2 Bar                Fri Dec 28 23:28  16/578   Re: Jabberwocky"
 
 # Save messages to the third mailbox
 mail_command "set folder=\"$MU_FOLDER_DIR\""
 mail_test "save 1 2 +three" \
-       "\"$MU_FOLDER_DIR/three\"  28/1003"
+       "\"$MU_FOLDER_DIR/three\"  28/968"
 
 mail_test "headers" \
-       ">*   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/425   MBOX"\
+       ">*   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX"\
        " *   2 Bar                Fri Dec 28 23:28  16/578   Re: Jabberwocky"
 
 mail_test -noprompt "quit" \
@@ -77,19 +77,19 @@ mail_test -noprompt "quit" \
 # Examine its contents
 mail_start -reuse-spool "--file=$MU_FOLDER_DIR/three"
 mail_test "headers" \
-       ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/425   MBOX"\
+       ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX"\
        " U   2 Bar                Fri Dec 28 23:28  16/578   Re: Jabberwocky"
 
 # Test uppercase commands (Save and Copy)
 mail_command "set outfolder=\"$MU_FOLDER_DIR\""
 mail_test "Save" \
-       "\"$MU_FOLDER_DIR/gray\"  12/425"
+       "\"$MU_FOLDER_DIR/gray\"  12/390"
 
 mail_test "file \"$MU_FOLDER_DIR/gray\"" \
        "Held 2 messages in $MU_FOLDER_DIR/three"
 
 mail_test "headers" \
-       ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/425   MBOX"
+       ">N   1 Sergey Poznyakoff  Tue Jul 16 12:11  12/390   MBOX"
 mail_exit
 
 # Test write 
diff --git a/mh/tests/scan.at b/mh/tests/scan.at
index f62c0c6..1b11828 100644
--- a/mh/tests/scan.at
+++ b/mh/tests/scan.at
@@ -48,9 +48,9 @@ scan +mbox1 -format '%4(msg) %(decode(friendly{from})) - 
%(decode(friendly{to}))
 [0],
 [   1 Foo Bar <[email protected]> - Bar <[email protected]>
    2 Bar <[email protected]> - Foo Bar <[email protected]>
-   3 Sergey Poznyakoff <[email protected]> - Foo Bar <foo...@nonexistent.
-   4 Sergey Poznyakoff <[email protected]> - Foo Bar <foo...@nonexistent.
-   5 Sergey Poznyakoff <[email protected]> - Foo Bar <foo...@nonexistent.
+   3 Sergey Poznyakoff <[email protected]> - Foo Bar <[email protected]>
+   4 Sergey Poznyakoff <[email protected]> - Foo Bar <[email protected]>
+   5 Sergey Poznyakoff <[email protected]> - Foo Bar <[email protected]>
 ])
 
 MH_CHECK([scan -form],[scan03 scan-form],[
@@ -61,9 +61,9 @@ scan +mbox1 -form formfile
 [0],
 [   1 Foo Bar <[email protected]> - Bar <[email protected]>
    2 Bar <[email protected]> - Foo Bar <[email protected]>
-   3 Sergey Poznyakoff <[email protected]> - Foo Bar <foo...@nonexistent.
-   4 Sergey Poznyakoff <[email protected]> - Foo Bar <foo...@nonexistent.
-   5 Sergey Poznyakoff <[email protected]> - Foo Bar <foo...@nonexistent.
+   3 Sergey Poznyakoff <[email protected]> - Foo Bar <[email protected]>
+   4 Sergey Poznyakoff <[email protected]> - Foo Bar <[email protected]>
+   5 Sergey Poznyakoff <[email protected]> - Foo Bar <[email protected]>
 ])
 
 MH_CHECK([scan -reverse],[scan04 scan-reverse],[
diff --git a/readmsg/tests/all.at b/readmsg/tests/all.at
index fd54991..8db52a6 100644
--- a/readmsg/tests/all.at
+++ b/readmsg/tests/all.at
@@ -71,11 +71,11 @@ that's clear, at any rate...
 To: Foo Bar <[email protected]>
 Subject: Simple MIME
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.1"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: How doth
 
 How doth the little crocodile
@@ -90,7 +90,7 @@ With gently smiling jaws!
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/octet-stream; name="msg.21"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 Content-Transfer-Encoding: base64
 
@@ -106,11 +106,11 @@ 
ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
 To: Foo Bar <[email protected]>
 Subject: Nested MIME
 Date: Sat, 13 Jul 2002 00:50:58 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.21"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 
 `You are old, Father William,' the young man said,
@@ -126,11 +126,11 @@ Why, I do it again and again.'
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa1
 Content-Type: application/octet-stream; name="msg.22"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part II
 Content-Transfer-Encoding: base64
 
@@ -144,11 +144,11 @@ IGNvdXBsZT8nCg==
 
 ------- =_aaaaaaaaaa1
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.23"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part III
 Content-Transfer-Encoding: base64
 
@@ -162,7 +162,7 @@ dCBvZiBteSBsaWZlLicK
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.24"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part IV
 Content-Transfer-Encoding: base64
 
@@ -183,17 +183,17 @@ IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
 To: Foo Bar <[email protected]>
 Subject: Empty MIME Parts
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="empty"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Empty part
 
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="single.line"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Single line part
 
 
diff --git a/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl 
b/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
index 2efcb9e..42e40bc 100644
--- a/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
+++ b/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
@@ -1,21 +1,21 @@
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLhIb05086
-       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLhIb05086
+       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Simple MIME
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 X-Envelope-Date: Sat Jul 13 00:43:18 2002
-X-Envelope-Sender: [email protected]
+X-Envelope-Sender: [email protected]
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.1"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: How doth
 
 How doth the little crocodile
@@ -30,7 +30,7 @@ With gently smiling jaws!
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/octet-stream; name="msg.21"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 Content-Transfer-Encoding: base64
 
diff --git a/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl 
b/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
index 4763565..fa7be1d 100644
--- a/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
+++ b/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
@@ -1,21 +1,21 @@
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLowb05126
-       for <[email protected]>; Sat, 13 Jul 2002 00:50:58 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLowb05126
+       for <[email protected]>; Sat, 13 Jul 2002 00:50:58 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Nested MIME
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:50:58 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 X-Envelope-Date: Sat Jul 13 00:50:58 2002
-X-Envelope-Sender: [email protected]
+X-Envelope-Sender: [email protected]
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.21"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 
 `You are old, Father William,' the young man said,
@@ -31,11 +31,11 @@ Why, I do it again and again.'
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa1
 Content-Type: application/octet-stream; name="msg.22"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part II
 Content-Transfer-Encoding: base64
 
@@ -49,11 +49,11 @@ IGNvdXBsZT8nCg==
 
 ------- =_aaaaaaaaaa1
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.23"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part III
 Content-Transfer-Encoding: base64
 
@@ -67,7 +67,7 @@ dCBvZiBteSBsaWZlLicK
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.24"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part IV
 Content-Transfer-Encoding: base64
 
diff --git a/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl 
b/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
index 660803f..e4422e2 100644
--- a/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
+++ b/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
@@ -1,27 +1,27 @@
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLhIb05086
-       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLhIb05086
+       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Empty MIME Parts
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 X-Envelope-Date: Sat Jul 13 00:43:18 2002
-X-Envelope-Sender: [email protected]
+X-Envelope-Sender: [email protected]
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="empty"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Empty part
 
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="single.line"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Single line part
 
 
diff --git a/testsuite/mh/mbox1/3 b/testsuite/mh/mbox1/3
index 2efcb9e..42e40bc 100644
--- a/testsuite/mh/mbox1/3
+++ b/testsuite/mh/mbox1/3
@@ -1,21 +1,21 @@
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLhIb05086
-       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLhIb05086
+       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Simple MIME
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 X-Envelope-Date: Sat Jul 13 00:43:18 2002
-X-Envelope-Sender: [email protected]
+X-Envelope-Sender: [email protected]
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.1"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: How doth
 
 How doth the little crocodile
@@ -30,7 +30,7 @@ With gently smiling jaws!
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/octet-stream; name="msg.21"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 Content-Transfer-Encoding: base64
 
diff --git a/testsuite/mh/mbox1/4 b/testsuite/mh/mbox1/4
index 4763565..fa7be1d 100644
--- a/testsuite/mh/mbox1/4
+++ b/testsuite/mh/mbox1/4
@@ -1,21 +1,21 @@
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLowb05126
-       for <[email protected]>; Sat, 13 Jul 2002 00:50:58 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLowb05126
+       for <[email protected]>; Sat, 13 Jul 2002 00:50:58 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Nested MIME
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:50:58 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 X-Envelope-Date: Sat Jul 13 00:50:58 2002
-X-Envelope-Sender: [email protected]
+X-Envelope-Sender: [email protected]
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.21"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 
 `You are old, Father William,' the young man said,
@@ -31,11 +31,11 @@ Why, I do it again and again.'
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa1
 Content-Type: application/octet-stream; name="msg.22"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part II
 Content-Transfer-Encoding: base64
 
@@ -49,11 +49,11 @@ IGNvdXBsZT8nCg==
 
 ------- =_aaaaaaaaaa1
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.23"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part III
 Content-Transfer-Encoding: base64
 
@@ -67,7 +67,7 @@ dCBvZiBteSBsaWZlLicK
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.24"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part IV
 Content-Transfer-Encoding: base64
 
diff --git a/testsuite/mh/mbox1/5 b/testsuite/mh/mbox1/5
index 660803f..e4422e2 100644
--- a/testsuite/mh/mbox1/5
+++ b/testsuite/mh/mbox1/5
@@ -1,27 +1,27 @@
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLhIb05086
-       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLhIb05086
+       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Empty MIME Parts
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 X-Envelope-Date: Sat Jul 13 00:43:18 2002
-X-Envelope-Sender: [email protected]
+X-Envelope-Sender: [email protected]
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="empty"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Empty part
 
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="single.line"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Single line part
 
 
diff --git a/testsuite/mime.at b/testsuite/mime.at
index cb023f7..8834562 100644
--- a/testsuite/mime.at
+++ b/testsuite/mime.at
@@ -83,12 +83,12 @@ that's clear, at any rate...
 
 End
 Message: 3
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 Subject: Simple MIME
 Number of parts in message - 2
-Total message size - 1625/42
+Total message size - 1569/42
 Type of part 1 = text/plain
-Message part size - 371/13: 141/4, 230/9
+Message part size - 364/13: 134/4, 230/9
 Text Message
 Begin
 How doth the little crocodile
@@ -103,7 +103,7 @@ With gently smiling jaws!
 
 End
 Type of part 2 = application/octet-stream
-Message part size - 645/11: 183/5, 462/6
+Message part size - 638/11: 176/5, 462/6
 Attachment - saving [[msg.21]]
 Begin
 `You are old, Father William,' the young man said,
@@ -119,12 +119,12 @@ Why, I do it again and again.'
 
 End
 Message: 4
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 Subject: Nested MIME
 Number of parts in message - 2
-Total message size - 3483/84
+Total message size - 3399/84
 Type of part 1 = text/plain
-Message part size - 496/14: 155/4, 341/10
+Message part size - 489/14: 148/4, 341/10
 Text Message
 Begin
 `You are old, Father William,' the young man said,
@@ -140,11 +140,11 @@ Why, I do it again and again.'
 
 End
 Type of part 2 = multipart/mixed
-Message part size - 2378/52: 114/3, 2264/49
+Message part size - 2343/52: 107/3, 2236/49
 Encapsulated message :         
 Begin
 Type of part 1 = application/octet-stream
-Message part size - 663/12: 184/5, 479/7
+Message part size - 656/12: 177/5, 479/7
 Attachment - saving [[msg.22]]
 Begin
 `You are old,' said the youth, `as I mentioned before,
@@ -159,11 +159,11 @@ Allow me to sell you a couple?'
 
 End
 Type of part 2 = multipart/mixed
-Message part size - 1531/32: 114/3, 1417/29
+Message part size - 1510/32: 107/3, 1403/29
 Encapsulated message :         
 Begin
 Type of part 1 = application/octet-stream
-Message part size - 668/12: 185/5, 483/7
+Message part size - 661/12: 178/5, 483/7
 Attachment - saving [[msg.23]]
 Begin
 `You are old,' said the youth, `and your jaws are too weak
@@ -178,7 +178,7 @@ Has lasted the rest of my life.'
 
 End
 Type of part 2 = application/octet-stream
-Message part size - 679/12: 184/5, 495/7
+Message part size - 672/12: 177/5, 495/7
 Attachment - saving [[msg.24]]
 Begin
 `You are old,' said the youth, `one would hardly suppose
@@ -197,18 +197,18 @@ End
 
 End
 Message: 5
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 Subject: Empty MIME Parts
 Number of parts in message - 2
-Total message size - 913/27
+Total message size - 857/27
 Type of part 1 = text/plain
-Message part size - 143/4: 143/4, 0/0
+Message part size - 136/4: 136/4, 0/0
 Text Message
 Begin
 
 End
 Type of part 2 = text/plain
-Message part size - 156/5: 155/4, 1/1
+Message part size - 149/5: 148/4, 1/1
 Text Message
 Begin
 
diff --git a/testsuite/spool/mbox b/testsuite/spool/mbox
index 67e9865..525ce77 100644
--- a/testsuite/spool/mbox
+++ b/testsuite/spool/mbox
@@ -1,13 +1,13 @@
-From [email protected] Tue Jul 16 12:11:35 2002
+From [email protected] Tue Jul 16 12:11:35 2002
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1]) 
-       by Mirddin.farlep.net with ESMTP id g6G9BZb00791
-       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1]) 
+       by example.net with ESMTP id g6G9BZb00791
+       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
+Message-Id: <[email protected]>
 To: Bar <[email protected]>
 Subject: MBOX
 Date: Tue, 16 Jul 2002 12:11:35 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 
 This is a sample user's mbox.
diff --git a/testsuite/spool/mbox1 b/testsuite/spool/mbox1
index dee5a97..302bb26 100644
--- a/testsuite/spool/mbox1
+++ b/testsuite/spool/mbox1
@@ -59,23 +59,23 @@ Somehow it seems to fill my head with ideas -- only I don't
 exactly know what they are!  However, SOMEBODY killed SOMETHING:
 that's clear, at any rate...
 
-From [email protected] Sat Jul 13 00:43:18 2002
+From [email protected] Sat Jul 13 00:43:18 2002
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLhIb05086
-       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLhIb05086
+       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Simple MIME
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.1"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: How doth
 
 How doth the little crocodile
@@ -90,7 +90,7 @@ With gently smiling jaws!
 
 ------- =_aaaaaaaaaa0
 Content-Type: application/octet-stream; name="msg.21"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 Content-Transfer-Encoding: base64
 
@@ -103,23 +103,23 @@ 
ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
 
 ------- =_aaaaaaaaaa0--
 
-From [email protected] Sat Jul 13 00:50:58 2002
+From [email protected] Sat Jul 13 00:50:58 2002
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLowb05126
-       for <[email protected]>; Sat, 13 Jul 2002 00:50:58 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLowb05126
+       for <[email protected]>; Sat, 13 Jul 2002 00:50:58 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Nested MIME
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:50:58 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="msg.21"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part I
 
 `You are old, Father William,' the young man said,
@@ -135,11 +135,11 @@ Why, I do it again and again.'
 
 ------- =_aaaaaaaaaa0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa1
 Content-Type: application/octet-stream; name="msg.22"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part II
 Content-Transfer-Encoding: base64
 
@@ -153,11 +153,11 @@ IGNvdXBsZT8nCg==
 
 ------- =_aaaaaaaaaa1
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.23"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part III
 Content-Transfer-Encoding: base64
 
@@ -171,7 +171,7 @@ dCBvZiBteSBsaWZlLicK
 
 ------- =_aaaaaaaaaa2
 Content-Type: application/octet-stream; name="msg.24"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Father William Part IV
 Content-Transfer-Encoding: base64
 
@@ -189,29 +189,29 @@ IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
 
 ------- =_aaaaaaaaaa0--
 
-From [email protected] Sat Jul 13 00:43:18 2002
+From [email protected] Sat Jul 13 00:43:18 2002
 Organization: Mailutils-tests
-Received: from Mirddin.farlep.net (localhost [127.0.0.1])
-       by Mirddin.farlep.net with ESMTP id g6CLhIb05086
-       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
-Message-Id: <[email protected]>
+Received: from example.net (localhost [127.0.0.1])
+       by example.net with ESMTP id g6CLhIb05086
+       for <[email protected]>; Sat, 13 Jul 2002 00:43:18 +0300
+Message-Id: <[email protected]>
 To: Foo Bar <[email protected]>
 Subject: Empty MIME Parts
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Date: Sat, 13 Jul 2002 00:43:18 +0300
-From: Sergey Poznyakoff <[email protected]>
+From: Sergey Poznyakoff <[email protected]>
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="empty"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Empty part
 
 
 ------- =_aaaaaaaaaa0
 Content-Type: text/plain; name="single.line"; charset="us-ascii"
-Content-ID: <[email protected]>
+Content-ID: <[email protected]>
 Content-Description: Single line part
 
 
diff --git a/testsuite/spool/relational.mbox b/testsuite/spool/relational.mbox
index 58bd695..5f79148 100644
--- a/testsuite/spool/relational.mbox
+++ b/testsuite/spool/relational.mbox
@@ -62,14 +62,14 @@ contradict to RFC 3028.
 From [email protected] Sun May  6 22:17:15 2001
 From: Bar <[email protected]>
 Received: from c.host.net ([1.1.1.3]) 
-       by Mirddin.farlep.net with ESMTP id g6G9BZb00791
-       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
+       by example.net with ESMTP id g6G9BZb00791
+       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
 Received: from b.host.net ([1.1.1.2]) 
        by c.host.net with ESMTP id g6G9BZb00791
-       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
+       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
 Received: from a.host.net ([1.1.1.1]) 
        by b.host.net with ESMTP id g6G9BZb00791
-       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
+       for <[email protected]>; Tue, 16 Jul 2002 12:11:35 +0300
 To: [email protected], [email protected], 
[email protected],
     [email protected], [email protected],
     [email protected]


hooks/post-receive
-- 
GNU Mailutils

_______________________________________________
Commit-mailutils mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-mailutils

Reply via email to