[SCM] GNU Mailutils branch, master, updated. release-2.2-83-g20300ee

"Sergey Poznyakoff" <[email protected]>
Newsgroups gmane.comp.gnu.mailutils.cvs
Message-ID <[email protected]>
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=20300ee417e027c1f2157a2e733982144ed35833

The branch, master has been updated
       via  20300ee417e027c1f2157a2e733982144ed35833 (commit)
       via  087627993732f3d00558d496e1baddf689112537 (commit)
      from  d74b5f53991d83e0a3c34e8d898cce942981ccb8 (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 20300ee417e027c1f2157a2e733982144ed35833
Author: Sergey Poznyakoff <[email protected]>
Date:   Fri Sep 17 00:48:07 2010 +0300

    Further improvement of the testsuite + some bugfixes.
    
    That's the first commit since the merge six days ago that passes
    distcheck (with python, cxx, imap and nntp disabled, of course).
    
    * testsuite/folder/DISTFILES: Restore. It is needed for some
    of the remaining DejaGNU tests.
    * testsuite/spool/DISTFILES: Likewise.
    * testsuite/testsuite.at: New file.
    * testsuite/atlocal.in: New file.
    * libmailutils/tests/mbdel.at: Move to testsuite/.
    * libmailutils/tests/mbdel.c: Likewise.
    * libmailutils/tests/mime.at: Likewise.
    * libmailutils/tests/mimetest.c: Likewise.
    
    * Makefile.am (SUBDIRS): Place testsuite after libproto.
    * configure.ac (AM_INIT_AUTOMAKE): Remove dist-lzma.
    (AC_CONFIG_FILES): Add testsuite/atlocal.
    * libmailutils/base64.c (_base64_decoder)
    (_base64_encoder): Fix the use of uninitialized variables.
    * libmailutils/tests/.gitignore: Remove mbdel and mimetest.
    * libmailutils/tests/Makefile.am (noinst_PROGRAMS): Remove mbdel and mimetest.
    (LDADD): Leave only MU_LIB_MAILUTILS.
    (TESTSUITE_AT): Remove mbdel.at and mime.at
    * libmailutils/tests/atlocal.in (PATH): Bugfix.
    * libmailutils/tests/testsuite.at: Remove inclusion of mbdel.at and mime.at.
    * po/POTFILES.in: Replace mailbox/ with libmailutils/.
    
    * testsuite/.gitignore: Rewrite.
    * testsuite/Makefile.am: Rewrite.
    * testsuite/mbdel.at: Set +w on all copied mailboxes.
    * testsuite/mimetest.c (main): Open mailbox for reading only.
    
    * sieve/Makefile.am: Add examples/ to the distribution.
    
    * libproto/mbox/mbox.c (mbox_open): Create locker only
    if the mailbox is open for modification.
    All users updated to check for mailbox->locker!=NULL before
    using it.

commit 087627993732f3d00558d496e1baddf689112537
Author: Sergey Poznyakoff <[email protected]>
Date:   Thu Sep 16 12:53:52 2010 +0300

    Test mailbox deletion.
    
    * libmailutils/tests/mbdel.at: New testcase.
    * libmailutils/tests/Makefile.am (TESTSUITE_AT): Add mbdel.at.
    * libmailutils/tests/testsuite.at: Include mbdel.at.
    * libproto/mbox/mbox.c (mbox_remove): Fix return code.
    
    * testsuite/maildir/mbox1: New test mailbox.
    * testsuite/mh/mbox1: New test mailbox.
    * testsuite/etc/DISTFILES: Remove.
    * testsuite/folder/DISTFILES: Remove.
    * testsuite/lib/DISTFILES: Remove.
    * testsuite/Makefile.am: Use EXTRA_DIST to distribute
    subdirs.

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

Summary of changes:
 Makefile.am                                        |    4 +-
 configure.ac                                       |   15 +-
 frm/tests/atlocal.in                               |    8 -
 frm/tests/testsuite.at                             |    4 +-
 include/mailutils/sys/stream.h                     |    2 +-
 libmailutils/base64.c                              |    4 +-
 libmailutils/tests/.gitignore                      |    2 -
 libmailutils/tests/Makefile.am                     |   18 +-
 libmailutils/tests/atlocal.in                      |    6 +-
 libmailutils/tests/base64d.at                      |    8 +-
 libmailutils/tests/base64e.at                      |   10 +-
 libmailutils/tests/mime.at                         |  220 ---------------
 libmailutils/tests/mimetest.c                      |  296 --------------------
 libmailutils/tests/testsuite.at                    |    2 +-
 libproto/mbox/mbox.c                               |   17 +-
 libproto/mbox/mboxscan.c                           |   31 ++-
 messages/tests/atlocal.in                          |    5 +-
 messages/tests/testsuite.at                        |    4 +-
 po/POTFILES.in                                     |   38 ++--
 readmsg/tests/atlocal.in                           |    2 -
 readmsg/tests/testsuite.at                         |    2 +-
 sieve/Makefile.am                                  |    1 +
 sieve/tests/atlocal.in                             |    9 -
 sieve/tests/ext.at                                 |    5 +-
 sieve/tests/redirect.at                            |    3 +-
 sieve/tests/reject.at                              |    3 +-
 sieve/tests/testsuite.at                           |    8 +-
 testsuite/.gitignore                               |   10 +-
 testsuite/Makefile.am                              |  134 ++++++---
 testsuite/atlocal.in                               |    5 +
 testsuite/etc/DISTFILES                            |    3 -
 testsuite/lib/DISTFILES                            |    1 -
 .../mbox1/new/1284628225.M17468P3883Q0.Trurl       |   47 +++
 .../mbox1/new/1284628225.M19181P3883Q1.Trurl       |   15 +
 .../mbox1/new/1284628225.M20118P3883Q2.Trurl       |   44 +++
 .../mbox1/new/1284628225.M21284P3883Q3.Trurl       |   86 ++++++
 .../mbox1/new/1284628225.M22502P3883Q4.Trurl       |   29 ++
 .../teaparty/new/1284627340.M261723P3770Q0.Trurl   |   13 +
 .../teaparty/new/1284627340.M264198P3770Q1.Trurl   |   12 +
 .../teaparty/new/1284627340.M265222P3770Q2.Trurl   |   12 +
 .../teaparty/new/1284627340.M266132P3770Q3.Trurl   |   12 +
 .../teaparty/new/1284627340.M267354P3770Q4.Trurl   |   12 +
 .../teaparty/new/1284627340.M268283P3770Q5.Trurl   |   13 +
 .../teaparty/new/1284627340.M269180P3770Q6.Trurl   |   12 +
 .../teaparty/new/1284627340.M270581P3770Q7.Trurl   |   12 +
 .../teaparty/new/1284627340.M271932P3770Q8.Trurl   |   12 +
 .../teaparty/new/1284627340.M273616P3770Q9.Trurl   |   12 +
 .../teaparty/new/1284627340.M275152P3770Q10.Trurl  |   12 +
 .../teaparty/new/1284627340.M276269P3770Q11.Trurl  |   12 +
 .../teaparty/new/1284627340.M277302P3770Q12.Trurl  |   12 +
 .../teaparty/new/1284627340.M278391P3770Q13.Trurl  |   13 +
 .../teaparty/new/1284627340.M279592P3770Q14.Trurl  |   14 +
 .../teaparty/new/1284627340.M280629P3770Q15.Trurl  |   13 +
 .../teaparty/new/1284627340.M281734P3770Q16.Trurl  |   14 +
 .../teaparty/new/1284627340.M282948P3770Q17.Trurl  |   12 +
 .../teaparty/new/1284627340.M284181P3770Q18.Trurl  |   12 +
 .../teaparty/new/1284627340.M285218P3770Q19.Trurl  |   12 +
 .../teaparty/new/1284627340.M286330P3770Q20.Trurl  |   12 +
 .../teaparty/new/1284627340.M287547P3770Q21.Trurl  |   12 +
 .../teaparty/new/1284627340.M288664P3770Q22.Trurl  |   13 +
 .../teaparty/new/1284627340.M289797P3770Q23.Trurl  |   12 +
 .../teaparty/new/1284627340.M290914P3770Q24.Trurl  |   13 +
 .../teaparty/new/1284627340.M292026P3770Q25.Trurl  |   12 +
 .../teaparty/new/1284627340.M293124P3770Q26.Trurl  |   13 +
 .../teaparty/new/1284627340.M294284P3770Q27.Trurl  |   12 +
 .../teaparty/new/1284627340.M295461P3770Q28.Trurl  |   12 +
 .../teaparty/new/1284627340.M296638P3770Q29.Trurl  |   12 +
 .../teaparty/new/1284627340.M297797P3770Q30.Trurl  |   13 +
 .../teaparty/new/1284627340.M298892P3770Q31.Trurl  |   12 +
 .../teaparty/new/1284627340.M299968P3770Q32.Trurl  |   12 +
 .../teaparty/new/1284627340.M301074P3770Q33.Trurl  |   12 +
 .../teaparty/new/1284627340.M302186P3770Q34.Trurl  |   12 +
 .../teaparty/new/1284627340.M303260P3770Q35.Trurl  |   13 +
 .../teaparty/new/1284627340.M304334P3770Q36.Trurl  |   13 +
 .../teaparty/new/1284627340.M305616P3770Q37.Trurl  |   12 +
 .../teaparty/new/1284627340.M306685P3770Q38.Trurl  |   12 +
 .../teaparty/new/1284627340.M307730P3770Q39.Trurl  |   12 +
 .../teaparty/new/1284627340.M308757P3770Q40.Trurl  |   17 ++
 .../teaparty/new/1284627340.M309833P3770Q41.Trurl  |   12 +
 .../teaparty/new/1284627340.M310887P3770Q42.Trurl  |   13 +
 .../teaparty/new/1284627340.M311940P3770Q43.Trurl  |   13 +
 .../teaparty/new/1284627340.M313089P3770Q44.Trurl  |   12 +
 .../teaparty/new/1284627340.M314179P3770Q45.Trurl  |   19 ++
 .../teaparty/new/1284627340.M315199P3770Q46.Trurl  |   12 +
 .../teaparty/new/1284627340.M316269P3770Q47.Trurl  |   16 +
 .../teaparty/new/1284627340.M317297P3770Q48.Trurl  |   12 +
 .../teaparty/new/1284627340.M319568P3770Q49.Trurl  |   13 +
 .../teaparty/new/1284627340.M320950P3770Q50.Trurl  |   12 +
 .../teaparty/new/1284627340.M323043P3770Q51.Trurl  |   12 +
 .../teaparty/new/1284627340.M324448P3770Q52.Trurl  |   13 +
 .../teaparty/new/1284627340.M325869P3770Q53.Trurl  |   13 +
 .../teaparty/new/1284627340.M327194P3770Q54.Trurl  |   12 +
 .../teaparty/new/1284627340.M328537P3770Q55.Trurl  |   12 +
 .../teaparty/new/1284627340.M329914P3770Q56.Trurl  |   12 +
 .../teaparty/new/1284627340.M331289P3770Q57.Trurl  |   13 +
 .../teaparty/new/1284627340.M332838P3770Q58.Trurl  |   12 +
 .../teaparty/new/1284627340.M334208P3770Q59.Trurl  |   14 +
 .../teaparty/new/1284627340.M335618P3770Q60.Trurl  |   13 +
 .../teaparty/new/1284627340.M336975P3770Q61.Trurl  |   12 +
 .../teaparty/new/1284627340.M338373P3770Q62.Trurl  |   12 +
 .../teaparty/new/1284627340.M339710P3770Q63.Trurl  |   13 +
 .../teaparty/new/1284627340.M341068P3770Q64.Trurl  |   14 +
 .../teaparty/new/1284627340.M342568P3770Q65.Trurl  |   12 +
 .../teaparty/new/1284627340.M344110P3770Q66.Trurl  |   12 +
 .../teaparty/new/1284627340.M345494P3770Q67.Trurl  |   12 +
 .../teaparty/new/1284627340.M346885P3770Q68.Trurl  |   12 +
 .../teaparty/new/1284627340.M348223P3770Q69.Trurl  |   12 +
 .../teaparty/new/1284627340.M349604P3770Q70.Trurl  |   12 +
 .../teaparty/new/1284627340.M350959P3770Q71.Trurl  |   13 +
 .../teaparty/new/1284627340.M352279P3770Q72.Trurl  |   13 +
 .../teaparty/new/1284627340.M353687P3770Q73.Trurl  |   12 +
 .../teaparty/new/1284627340.M355220P3770Q74.Trurl  |   12 +
 .../teaparty/new/1284627340.M356601P3770Q75.Trurl  |   13 +
 .../teaparty/new/1284627340.M358019P3770Q76.Trurl  |   12 +
 .../teaparty/new/1284627340.M359379P3770Q77.Trurl  |   12 +
 .../teaparty/new/1284627340.M360741P3770Q78.Trurl  |   13 +
 .../teaparty/new/1284627340.M362164P3770Q79.Trurl  |   13 +
 .../teaparty/new/1284627340.M363564P3770Q80.Trurl  |   13 +
 .../teaparty/new/1284627340.M364969P3770Q81.Trurl  |   12 +
 .../teaparty/new/1284627340.M366552P3770Q82.Trurl  |   12 +
 .../teaparty/new/1284627340.M367871P3770Q83.Trurl  |   13 +
 .../teaparty/new/1284627340.M369631P3770Q84.Trurl  |   13 +
 .../teaparty/new/1284627340.M371207P3770Q85.Trurl  |   14 +
 .../teaparty/new/1284627340.M372773P3770Q86.Trurl  |   12 +
 .../teaparty/new/1284627340.M374547P3770Q87.Trurl  |   12 +
 .../teaparty/new/1284627340.M376748P3770Q88.Trurl  |   13 +
 .../teaparty/new/1284627340.M378593P3770Q89.Trurl  |   12 +
 .../teaparty/new/1284627340.M380152P3770Q90.Trurl  |   12 +
 .../teaparty/new/1284627340.M381696P3770Q91.Trurl  |   15 +
 .../teaparty/new/1284627340.M383396P3770Q92.Trurl  |   12 +
 .../teaparty/new/1284627340.M385021P3770Q93.Trurl  |   12 +
 .../teaparty/new/1284627340.M386577P3770Q94.Trurl  |   13 +
 testsuite/mbdel.at                                 |   78 +++++
 {libmailutils/tests => testsuite}/mbdel.c          |    0
 testsuite/mh/mbox1/1                               |   47 +++
 testsuite/mh/mbox1/2                               |   15 +
 testsuite/mh/mbox1/3                               |   44 +++
 testsuite/mh/mbox1/4                               |   86 ++++++
 testsuite/mh/mbox1/5                               |   29 ++
 testsuite/mh/teaparty/1                            |   13 +
 testsuite/mh/teaparty/10                           |   12 +
 testsuite/mh/teaparty/11                           |   12 +
 testsuite/mh/teaparty/12                           |   12 +
 testsuite/mh/teaparty/13                           |   12 +
 testsuite/mh/teaparty/14                           |   13 +
 testsuite/mh/teaparty/15                           |   14 +
 testsuite/mh/teaparty/16                           |   13 +
 testsuite/mh/teaparty/17                           |   14 +
 testsuite/mh/teaparty/18                           |   12 +
 testsuite/mh/teaparty/19                           |   12 +
 testsuite/mh/teaparty/2                            |   12 +
 testsuite/mh/teaparty/20                           |   12 +
 testsuite/mh/teaparty/21                           |   12 +
 testsuite/mh/teaparty/22                           |   12 +
 testsuite/mh/teaparty/23                           |   13 +
 testsuite/mh/teaparty/24                           |   12 +
 testsuite/mh/teaparty/25                           |   13 +
 testsuite/mh/teaparty/26                           |   12 +
 testsuite/mh/teaparty/27                           |   13 +
 testsuite/mh/teaparty/28                           |   12 +
 testsuite/mh/teaparty/29                           |   12 +
 testsuite/mh/teaparty/3                            |   12 +
 testsuite/mh/teaparty/30                           |   12 +
 testsuite/mh/teaparty/31                           |   13 +
 testsuite/mh/teaparty/32                           |   12 +
 testsuite/mh/teaparty/33                           |   12 +
 testsuite/mh/teaparty/34                           |   12 +
 testsuite/mh/teaparty/35                           |   12 +
 testsuite/mh/teaparty/36                           |   13 +
 testsuite/mh/teaparty/37                           |   13 +
 testsuite/mh/teaparty/38                           |   12 +
 testsuite/mh/teaparty/39                           |   12 +
 testsuite/mh/teaparty/4                            |   12 +
 testsuite/mh/teaparty/40                           |   12 +
 testsuite/mh/teaparty/41                           |   17 ++
 testsuite/mh/teaparty/42                           |   12 +
 testsuite/mh/teaparty/43                           |   13 +
 testsuite/mh/teaparty/44                           |   13 +
 testsuite/mh/teaparty/45                           |   12 +
 testsuite/mh/teaparty/46                           |   19 ++
 testsuite/mh/teaparty/47                           |   12 +
 testsuite/mh/teaparty/48                           |   16 +
 testsuite/mh/teaparty/49                           |   12 +
 testsuite/mh/teaparty/5                            |   12 +
 testsuite/mh/teaparty/50                           |   13 +
 testsuite/mh/teaparty/51                           |   12 +
 testsuite/mh/teaparty/52                           |   12 +
 testsuite/mh/teaparty/53                           |   13 +
 testsuite/mh/teaparty/54                           |   13 +
 testsuite/mh/teaparty/55                           |   12 +
 testsuite/mh/teaparty/56                           |   12 +
 testsuite/mh/teaparty/57                           |   12 +
 testsuite/mh/teaparty/58                           |   13 +
 testsuite/mh/teaparty/59                           |   12 +
 testsuite/mh/teaparty/6                            |   13 +
 testsuite/mh/teaparty/60                           |   14 +
 testsuite/mh/teaparty/61                           |   13 +
 testsuite/mh/teaparty/62                           |   12 +
 testsuite/mh/teaparty/63                           |   12 +
 testsuite/mh/teaparty/64                           |   13 +
 testsuite/mh/teaparty/65                           |   14 +
 testsuite/mh/teaparty/66                           |   12 +
 testsuite/mh/teaparty/67                           |   12 +
 testsuite/mh/teaparty/68                           |   12 +
 testsuite/mh/teaparty/69                           |   12 +
 testsuite/mh/teaparty/7                            |   12 +
 testsuite/mh/teaparty/70                           |   12 +
 testsuite/mh/teaparty/71                           |   12 +
 testsuite/mh/teaparty/72                           |   13 +
 testsuite/mh/teaparty/73                           |   13 +
 testsuite/mh/teaparty/74                           |   12 +
 testsuite/mh/teaparty/75                           |   12 +
 testsuite/mh/teaparty/76                           |   13 +
 testsuite/mh/teaparty/77                           |   12 +
 testsuite/mh/teaparty/78                           |   12 +
 testsuite/mh/teaparty/79                           |   13 +
 testsuite/mh/teaparty/8                            |   12 +
 testsuite/mh/teaparty/80                           |   13 +
 testsuite/mh/teaparty/81                           |   13 +
 testsuite/mh/teaparty/82                           |   12 +
 testsuite/mh/teaparty/83                           |   12 +
 testsuite/mh/teaparty/84                           |   13 +
 testsuite/mh/teaparty/85                           |   13 +
 testsuite/mh/teaparty/86                           |   14 +
 testsuite/mh/teaparty/87                           |   12 +
 testsuite/mh/teaparty/88                           |   12 +
 testsuite/mh/teaparty/89                           |   13 +
 testsuite/mh/teaparty/9                            |   12 +
 testsuite/mh/teaparty/90                           |   12 +
 testsuite/mh/teaparty/91                           |   12 +
 testsuite/mh/teaparty/92                           |   15 +
 testsuite/mh/teaparty/93                           |   12 +
 testsuite/mh/teaparty/94                           |   12 +
 testsuite/mh/teaparty/95                           |   13 +
 testsuite/mime.at                                  |  220 +++++++++++++++
 testsuite/mimetest.c                               |  296 ++++++++++++++++++++
 testsuite/testsuite.at                             |   23 ++
 237 files changed, 3652 insertions(+), 681 deletions(-)
 delete mode 100644 libmailutils/tests/mime.at
 delete mode 100644 libmailutils/tests/mimetest.c
 create mode 100644 testsuite/atlocal.in
 delete mode 100644 testsuite/etc/DISTFILES
 delete mode 100644 testsuite/lib/DISTFILES
 create mode 100644 testsuite/maildir/mbox1/new/1284628225.M17468P3883Q0.Trurl
 create mode 100644 testsuite/maildir/mbox1/new/1284628225.M19181P3883Q1.Trurl
 create mode 100644 testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
 create mode 100644 testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
 create mode 100644 testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M261723P3770Q0.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M264198P3770Q1.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M265222P3770Q2.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M266132P3770Q3.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M267354P3770Q4.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M268283P3770Q5.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M269180P3770Q6.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M270581P3770Q7.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M271932P3770Q8.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M273616P3770Q9.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M275152P3770Q10.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M276269P3770Q11.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M277302P3770Q12.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M278391P3770Q13.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M279592P3770Q14.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M280629P3770Q15.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M281734P3770Q16.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M282948P3770Q17.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M284181P3770Q18.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M285218P3770Q19.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M286330P3770Q20.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M287547P3770Q21.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M288664P3770Q22.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M289797P3770Q23.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M290914P3770Q24.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M292026P3770Q25.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M293124P3770Q26.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M294284P3770Q27.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M295461P3770Q28.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M296638P3770Q29.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M297797P3770Q30.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M298892P3770Q31.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M299968P3770Q32.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M301074P3770Q33.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M302186P3770Q34.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M303260P3770Q35.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M304334P3770Q36.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M305616P3770Q37.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M306685P3770Q38.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M307730P3770Q39.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M308757P3770Q40.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M309833P3770Q41.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M310887P3770Q42.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M311940P3770Q43.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M313089P3770Q44.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M314179P3770Q45.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M315199P3770Q46.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M316269P3770Q47.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M317297P3770Q48.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M319568P3770Q49.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M320950P3770Q50.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M323043P3770Q51.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M324448P3770Q52.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M325869P3770Q53.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M327194P3770Q54.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M328537P3770Q55.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M329914P3770Q56.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M331289P3770Q57.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M332838P3770Q58.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M334208P3770Q59.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M335618P3770Q60.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M336975P3770Q61.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M338373P3770Q62.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M339710P3770Q63.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M341068P3770Q64.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M342568P3770Q65.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M344110P3770Q66.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M345494P3770Q67.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M346885P3770Q68.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M348223P3770Q69.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M349604P3770Q70.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M350959P3770Q71.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M352279P3770Q72.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M353687P3770Q73.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M355220P3770Q74.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M356601P3770Q75.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M358019P3770Q76.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M359379P3770Q77.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M360741P3770Q78.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M362164P3770Q79.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M363564P3770Q80.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M364969P3770Q81.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M366552P3770Q82.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M367871P3770Q83.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M369631P3770Q84.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M371207P3770Q85.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M372773P3770Q86.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M374547P3770Q87.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M376748P3770Q88.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M378593P3770Q89.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M380152P3770Q90.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M381696P3770Q91.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M383396P3770Q92.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M385021P3770Q93.Trurl
 create mode 100644 testsuite/maildir/teaparty/new/1284627340.M386577P3770Q94.Trurl
 create mode 100644 testsuite/mbdel.at
 rename {libmailutils/tests => testsuite}/mbdel.c (100%)
 create mode 100644 testsuite/mh/mbox1/1
 create mode 100644 testsuite/mh/mbox1/2
 create mode 100644 testsuite/mh/mbox1/3
 create mode 100644 testsuite/mh/mbox1/4
 create mode 100644 testsuite/mh/mbox1/5
 create mode 100644 testsuite/mh/teaparty/1
 create mode 100644 testsuite/mh/teaparty/10
 create mode 100644 testsuite/mh/teaparty/11
 create mode 100644 testsuite/mh/teaparty/12
 create mode 100644 testsuite/mh/teaparty/13
 create mode 100644 testsuite/mh/teaparty/14
 create mode 100644 testsuite/mh/teaparty/15
 create mode 100644 testsuite/mh/teaparty/16
 create mode 100644 testsuite/mh/teaparty/17
 create mode 100644 testsuite/mh/teaparty/18
 create mode 100644 testsuite/mh/teaparty/19
 create mode 100644 testsuite/mh/teaparty/2
 create mode 100644 testsuite/mh/teaparty/20
 create mode 100644 testsuite/mh/teaparty/21
 create mode 100644 testsuite/mh/teaparty/22
 create mode 100644 testsuite/mh/teaparty/23
 create mode 100644 testsuite/mh/teaparty/24
 create mode 100644 testsuite/mh/teaparty/25
 create mode 100644 testsuite/mh/teaparty/26
 create mode 100644 testsuite/mh/teaparty/27
 create mode 100644 testsuite/mh/teaparty/28
 create mode 100644 testsuite/mh/teaparty/29
 create mode 100644 testsuite/mh/teaparty/3
 create mode 100644 testsuite/mh/teaparty/30
 create mode 100644 testsuite/mh/teaparty/31
 create mode 100644 testsuite/mh/teaparty/32
 create mode 100644 testsuite/mh/teaparty/33
 create mode 100644 testsuite/mh/teaparty/34
 create mode 100644 testsuite/mh/teaparty/35
 create mode 100644 testsuite/mh/teaparty/36
 create mode 100644 testsuite/mh/teaparty/37
 create mode 100644 testsuite/mh/teaparty/38
 create mode 100644 testsuite/mh/teaparty/39
 create mode 100644 testsuite/mh/teaparty/4
 create mode 100644 testsuite/mh/teaparty/40
 create mode 100644 testsuite/mh/teaparty/41
 create mode 100644 testsuite/mh/teaparty/42
 create mode 100644 testsuite/mh/teaparty/43
 create mode 100644 testsuite/mh/teaparty/44
 create mode 100644 testsuite/mh/teaparty/45
 create mode 100644 testsuite/mh/teaparty/46
 create mode 100644 testsuite/mh/teaparty/47
 create mode 100644 testsuite/mh/teaparty/48
 create mode 100644 testsuite/mh/teaparty/49
 create mode 100644 testsuite/mh/teaparty/5
 create mode 100644 testsuite/mh/teaparty/50
 create mode 100644 testsuite/mh/teaparty/51
 create mode 100644 testsuite/mh/teaparty/52
 create mode 100644 testsuite/mh/teaparty/53
 create mode 100644 testsuite/mh/teaparty/54
 create mode 100644 testsuite/mh/teaparty/55
 create mode 100644 testsuite/mh/teaparty/56
 create mode 100644 testsuite/mh/teaparty/57
 create mode 100644 testsuite/mh/teaparty/58
 create mode 100644 testsuite/mh/teaparty/59
 create mode 100644 testsuite/mh/teaparty/6
 create mode 100644 testsuite/mh/teaparty/60
 create mode 100644 testsuite/mh/teaparty/61
 create mode 100644 testsuite/mh/teaparty/62
 create mode 100644 testsuite/mh/teaparty/63
 create mode 100644 testsuite/mh/teaparty/64
 create mode 100644 testsuite/mh/teaparty/65
 create mode 100644 testsuite/mh/teaparty/66
 create mode 100644 testsuite/mh/teaparty/67
 create mode 100644 testsuite/mh/teaparty/68
 create mode 100644 testsuite/mh/teaparty/69
 create mode 100644 testsuite/mh/teaparty/7
 create mode 100644 testsuite/mh/teaparty/70
 create mode 100644 testsuite/mh/teaparty/71
 create mode 100644 testsuite/mh/teaparty/72
 create mode 100644 testsuite/mh/teaparty/73
 create mode 100644 testsuite/mh/teaparty/74
 create mode 100644 testsuite/mh/teaparty/75
 create mode 100644 testsuite/mh/teaparty/76
 create mode 100644 testsuite/mh/teaparty/77
 create mode 100644 testsuite/mh/teaparty/78
 create mode 100644 testsuite/mh/teaparty/79
 create mode 100644 testsuite/mh/teaparty/8
 create mode 100644 testsuite/mh/teaparty/80
 create mode 100644 testsuite/mh/teaparty/81
 create mode 100644 testsuite/mh/teaparty/82
 create mode 100644 testsuite/mh/teaparty/83
 create mode 100644 testsuite/mh/teaparty/84
 create mode 100644 testsuite/mh/teaparty/85
 create mode 100644 testsuite/mh/teaparty/86
 create mode 100644 testsuite/mh/teaparty/87
 create mode 100644 testsuite/mh/teaparty/88
 create mode 100644 testsuite/mh/teaparty/89
 create mode 100644 testsuite/mh/teaparty/9
 create mode 100644 testsuite/mh/teaparty/90
 create mode 100644 testsuite/mh/teaparty/91
 create mode 100644 testsuite/mh/teaparty/92
 create mode 100644 testsuite/mh/teaparty/93
 create mode 100644 testsuite/mh/teaparty/94
 create mode 100644 testsuite/mh/teaparty/95
 create mode 100644 testsuite/mime.at
 create mode 100644 testsuite/mimetest.c
 create mode 100644 testsuite/testsuite.at

diff --git a/Makefile.am b/Makefile.am
index 86c26cd..e5c9423 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,11 +93,11 @@ SUBDIRS = . \
  mu-aux\
  include\
  po\
- testsuite\
  libmailutils\
  sql\
  libmu_auth\
  libproto\
+ testsuite\
  lib\
  libmu_argp\
  libmu_cfg\
@@ -126,7 +126,7 @@ SUBDIRS = . \
 
 EXTRA_DIST = COPYING.LESSER paths git-describe git-describe.h
 BUILT_SOURCES = git-describe git-describe.h
-DISTCLEANFILES = pathdefs.h
+DISTCLEANFILES = pathdefs.h git-describe.h
 
 gen_start_date = "2008-12-08"
 prev_change_log = "doc/ChangeLog.CVS"
diff --git a/configure.ac b/configure.ac
index 59ced52..9a44d17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ(2.63)
 AC_INIT([GNU Mailutils], [2.2.90], [[email protected]], [mailutils])
 AC_CONFIG_SRCDIR([libmailutils/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-lzma dist-xz std-options silent-rules])
+AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-xz std-options silent-rules])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -1210,9 +1210,17 @@ AC_ARG_WITH([mh-bindir],
 
 
 # Initialize the (autotest) test suite.
-AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_TESTDIR(libmailutils/tests)
+AC_CONFIG_TESTDIR(testsuite)
+AC_CONFIG_TESTDIR(frm/tests)
+AC_CONFIG_TESTDIR(messages/tests)
+AC_CONFIG_TESTDIR(readmsg/tests)
+AC_CONFIG_TESTDIR(sieve/tests)
+
 AC_CONFIG_FILES([libmailutils/tests/Makefile
-                 libmailutils/tests/atlocal 
+                 libmailutils/tests/atlocal
+	         testsuite/Makefile
+                 testsuite/atlocal
                  frm/tests/Makefile
                  frm/tests/atlocal
 		 messages/tests/Makefile
@@ -1380,7 +1388,6 @@ AC_CONFIG_FILES([
  mu-aux/Makefile
  mu-aux/mailutils.spec
  sieve/Makefile
- testsuite/Makefile
  ])
 AC_OUTPUT
 
diff --git a/frm/tests/atlocal.in b/frm/tests/atlocal.in
index c334d2a..3b46787 100644
--- a/frm/tests/atlocal.in
+++ b/frm/tests/atlocal.in
@@ -3,12 +3,4 @@
 # Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@:@abs_top_builddir@/frm:$top_srcdir:$srcdir:$PATH
-top_srcdir=@abs_top_srcdir@
-top_builddir=@abs_top_builddir@
-
-initspool() {
-  test -d data || mkdir data
-  test -d data/spool || mkdir data/spool
-  cp $top_srcdir/testsuite/spool/* data/spool
-}
   
\ No newline at end of file
diff --git a/frm/tests/testsuite.at b/frm/tests/testsuite.at
index 0afd415..c55f3a6 100644
--- a/frm/tests/testsuite.at
+++ b/frm/tests/testsuite.at
@@ -33,7 +33,7 @@ m4_define([FRMTEST],[
 AT_SETUP([$1])
 AT_KEYWORDS([$2])
 AT_CHECK([
-MAIL=$top_srcdir/testsuite/spool/FRM_MAILBOX
+MAIL=$abs_top_srcdir/testsuite/spool/FRM_MAILBOX
 FOLDER=$MAIL
 export MAIL FOLDER
 frm FRM_OPTIONS $3],
@@ -89,7 +89,7 @@ FRMTEST([frm -q],[frm-q frm04],
 ])
 
 FRMTEST([frm +mbox],[frm+mbox frm05],
-[--set ":mailbox:folder=$top_srcdir/testsuite/spool" +mbox],
+[--set ":mailbox:folder=$abs_top_srcdir/testsuite/spool" +mbox],
 [1],
 [Sergey Poznyakoff	MBOX
 ])
diff --git a/include/mailutils/sys/stream.h b/include/mailutils/sys/stream.h
index 935fa4b..4e4fc51 100644
--- a/include/mailutils/sys/stream.h
+++ b/include/mailutils/sys/stream.h
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/libmailutils/base64.c b/libmailutils/base64.c
index 7a8c622..d3ec098 100644
--- a/libmailutils/base64.c
+++ b/libmailutils/base64.c
@@ -128,7 +128,7 @@ _base64_decoder (void *xd MU_ARG_UNUSED,
       break;
     }
   
-  if (osize <= 3)
+  if (iobuf->osize <= 3)
     {
       iobuf->osize = 3;
       return mu_filter_moreoutput;
@@ -207,7 +207,7 @@ _base64_encoder (void *xd MU_ARG_UNUSED,
 	  return mu_filter_moreinput;
 	}
     }
-  if (osize < 4)
+  if (iobuf->osize < 4)
     {
       iobuf->osize = 4;
       return mu_filter_moreoutput;
diff --git a/libmailutils/tests/.gitignore b/libmailutils/tests/.gitignore
index 925b0df..63b7b53 100644
--- a/libmailutils/tests/.gitignore
+++ b/libmailutils/tests/.gitignore
@@ -11,6 +11,4 @@ encode2047
 fltst
 listop
 mailcap
-mbdel
-mimetest
 url-parse
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index 89ca27c..52161b4 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of GNU Mailutils.
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # GNU Mailutils is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -47,22 +47,9 @@ noinst_PROGRAMS = \
  fltst\
  listop\
  mailcap\
- mbdel\
- mimetest\
  url-parse
 
-LDADD =\
- ../../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_NNTP}\
- ${MU_LIB_MH}\
- ${MU_LIB_MAILDIR}\
- ${MU_LIB_MAILER}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
+LDADD = ${MU_LIB_MAILUTILS}
 
 EXTRA_DIST += Encode Decode
 
@@ -79,7 +66,6 @@ TESTSUITE_AT = \
  encode2047.at\
  list.at\
  mailcap.at\
- mime.at\
  testsuite.at\
  url.at
 
diff --git a/libmailutils/tests/atlocal.in b/libmailutils/tests/atlocal.in
index 7e81e43..1f0b813 100644
--- a/libmailutils/tests/atlocal.in
+++ b/libmailutils/tests/atlocal.in
@@ -2,8 +2,4 @@
 # Configurable variable values for Mailutils test suite.
 # Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
-PATH=@abs_builddir@:@abs_top_builddir@/frm:$top_srcdir:$srcdir:$PATH
-top_srcdir=@abs_top_srcdir@
-top_builddir=@abs_top_builddir@
-
-  
\ No newline at end of file
+PATH=@abs_builddir@:@abs_top_builddir@/libmailutils/tests:$top_srcdir:$srcdir:$PATH
diff --git a/libmailutils/tests/base64d.at b/libmailutils/tests/base64d.at
index 7483dd6..b26c415 100644
--- a/libmailutils/tests/base64d.at
+++ b/libmailutils/tests/base64d.at
@@ -19,8 +19,8 @@ AT_SETUP([base64 decoding (read)])
 AT_KEYWORDS([base64 base64d base64dr decode])
 
 AT_CHECK([
-cp $top_srcdir/libmailutils/tests/Encode expout
-fltst base64 decode read linelen=0 < $top_srcdir/libmailutils/tests/Decode],
+cp $abs_top_srcdir/libmailutils/tests/Encode expout
+fltst base64 decode read linelen=0 < $abs_top_srcdir/libmailutils/tests/Decode],
 [0],
 [expout])
 
@@ -31,8 +31,8 @@ AT_SETUP([base64 decoding (write)])
 AT_KEYWORDS([base64 base64d base64dw decode])
 
 AT_CHECK([
-cp $top_srcdir/libmailutils/tests/Encode expout
-fltst base64 decode write linelen=0 < $top_srcdir/libmailutils/tests/Decode],
+cp $abs_top_srcdir/libmailutils/tests/Encode expout
+fltst base64 decode write linelen=0 < $abs_top_srcdir/libmailutils/tests/Decode],
 [0],
 [expout])
 
diff --git a/libmailutils/tests/base64e.at b/libmailutils/tests/base64e.at
index 452ed8f..c753471 100644
--- a/libmailutils/tests/base64e.at
+++ b/libmailutils/tests/base64e.at
@@ -19,8 +19,8 @@ AT_SETUP([base64 encoding (read)])
 AT_KEYWORDS([base64 base64e base64er encode])
 
 AT_CHECK([
-cp $top_srcdir/libmailutils/tests/Decode expout
-fltst base64 encode read nl < $top_srcdir/libmailutils/tests/Encode],
+cp $abs_top_srcdir/libmailutils/tests/Decode expout
+fltst base64 encode read nl < $abs_top_srcdir/libmailutils/tests/Encode],
 [0],
 [expout])
 
@@ -31,9 +31,9 @@ AT_SETUP([base64 encoding (write)])
 AT_KEYWORDS([base64 base64e base64ew encode])
 
 AT_CHECK([
-cp $top_srcdir/libmailutils/tests/Decode expout
-fltst base64 encode write nl < $top_srcdir/libmailutils/tests/Encode],
+cp $abs_top_srcdir/libmailutils/tests/Decode expout
+fltst base64 encode write nl < $abs_top_srcdir/libmailutils/tests/Encode],
 [0],
 [expout])
 
-AT_CLEANUP
\ No newline at end of file
+AT_CLEANUP
diff --git a/libmailutils/tests/mime.at b/libmailutils/tests/mime.at
deleted file mode 100644
index abed841..0000000
--- a/libmailutils/tests/mime.at
+++ /dev/null
@@ -1,220 +0,0 @@
-# This file is part of GNU Mailutils. -*- Autotest -*-
-# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# GNU Mailutils is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 3, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
-# This file is part of Mailfromd testsuite. 
-
-AT_SETUP([mime])
-
-# FIXME: Mimetest should probably be fixed to avoid the use of `tr'
-# and `sed' here.
-AT_CHECK([mimetest -i 0 -p $top_srcdir/testsuite/spool/mbox1 | dnl
-          tr '\t' ' ' | sed 's/  *$//'],
-[0],
-[Message: 1
-From: Foo Bar <[email protected]>
-Subject: Jabberwocky
-Number of parts in message - 1
-Total message size - 1254/44
-Type of part 1 = 
-Message part size - 1254/44: 317/9, 937/35
-Text Message
-Begin
-`Twas brillig, and the slithy toves
-Did gyre and gimble in the wabe;
-All mimsy were the borogoves,
-And the mome raths outgrabe.
-
-`Beware the Jabberwock, my son!
-The jaws that bite, the claws that catch!
-Beware the Jujub bird, and shun
-The frumious Bandersnatch!'
-
-He took his vorpal sword in hand:
-Long time the manxome foe he sought --
-So rested he by the Tumtum gree,
-And stood awhile in thought.
-
-And as in uffish thought he stood,
-The Jabberwock, with eyes of flame,
-Came whiffling through the tulgey wook,
-And burbled as it came!
-
-One, two!  One, two!  And through and through
-The vorpal blade went snicker-snack!
-He left it dead, and with its head
-He went galumphing back.
-
-`And has thou slain the Jabberwock?
-Come to my arms, my beamish boy!
-O frabjous day!  Calloh!  Callay!
-He chortled in his joy.
-
-`Twas brillig, and the slithy toves
-Did gyre and gimble in the wabe;
-All mimsy were the borogoves,
-And the mome raths outgrabe.
-
-
-End
-Message: 2
-From: Bar <[email protected]>
-Subject: Re: Jabberwocky
-Number of parts in message - 1
-Total message size - 534/13
-Type of part 1 = 
-Message part size - 534/13: 319/9, 215/4
-Text Message
-Begin
-It seems very pretty, but it's *rather* hard to understand!'
-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...
-
-End
-Message: 3
-From: Sergey Poznyakoff <[email protected]>
-Subject: Simple MIME
-Number of parts in message - 2
-Total message size - 1625/42
-Type of part 1 = text/plain
-Message part size - 371/13: 141/4, 230/9
-Text Message
-Begin
-How doth the little crocodile
-Improve his shining tail,
-And pour the waters of the Nile
-On every golden scale!
-
-`How cheerfully he seems to grin,
-How neatly spread his claws,
-And welcome little fishes in
-With gently smiling jaws!
-
-End
-Type of part 2 = application/octet-stream
-Message part size - 645/11: 183/5, 462/6
-Attachment - saving [[msg.21]]
-Begin
-`You are old, Father William,' the young man said,
-`And your hair has become very white;
-And yet you incessantly stand on your head--
-Do you think, at your age, it is right?'
-
-`In my youth,' Father William replied to his son,
-`I feared it might injure the brain;
-But, now that I'm perfectly sure I have none,
-Why, I do it again and again.'
-
-
-End
-Message: 4
-From: Sergey Poznyakoff <[email protected]>
-Subject: Nested MIME
-Number of parts in message - 2
-Total message size - 3483/84
-Type of part 1 = text/plain
-Message part size - 496/14: 155/4, 341/10
-Text Message
-Begin
-`You are old, Father William,' the young man said,
-`And your hair has become very white;
-And yet you incessantly stand on your head--
-Do you think, at your age, it is right?'
-
-`In my youth,' Father William replied to his son,
-`I feared it might injure the brain;
-But, now that I'm perfectly sure I have none,
-Why, I do it again and again.'
-
-
-End
-Type of part 2 = multipart/mixed
-Message part size - 2378/52: 114/3, 2264/49
-Encapsulated message : 	
-Begin
-Type of part 1 = application/octet-stream
-Message part size - 663/12: 184/5, 479/7
-Attachment - saving [[msg.22]]
-Begin
-`You are old,' said the youth, `as I mentioned before,
-And have grown most uncommonly fat;
-Yet you turned a back-somersault in at the door--
-Pray, what is the reason of that?'
-
-`In my youth,' said the sage, as he shook his grey locks,
-`I kept all my limbs very supple
-By the use of this ointment--one shilling the box--
-Allow me to sell you a couple?'
-
-End
-Type of part 2 = multipart/mixed
-Message part size - 1531/32: 114/3, 1417/29
-Encapsulated message : 	
-Begin
-Type of part 1 = application/octet-stream
-Message part size - 668/12: 185/5, 483/7
-Attachment - saving [[msg.23]]
-Begin
-`You are old,' said the youth, `and your jaws are too weak
-For anything tougher than suet;
-Yet you finished the goose, with the bones and the beak--
-Pray how did you manage to do it?'
-
-`In my youth,' said his father, `I took to the law,
-And argued each case with my wife;
-And the muscular strength, which it gave to my jaw,
-Has lasted the rest of my life.'
-
-End
-Type of part 2 = application/octet-stream
-Message part size - 679/12: 184/5, 495/7
-Attachment - saving [[msg.24]]
-Begin
-`You are old,' said the youth, `one would hardly suppose
-That your eye was as steady as ever;
-Yet you balanced an eel on the end of your nose--
-What made you so awfully clever?'
-
-`I have answered three questions, and that is enough,'
-Said his father; `don't give yourself airs!
-Do you think I can listen all day to such stuff?
-Be off, or I'll kick you down stairs!'
-
-End
-
-End
-
-End
-Message: 5
-From: Sergey Poznyakoff <[email protected]>
-Subject: Empty MIME Parts
-Number of parts in message - 2
-Total message size - 913/27
-Type of part 1 = text/plain
-Message part size - 143/4: 143/4, 0/0
-Text Message
-Begin
-
-End
-Type of part 2 = text/plain
-Message part size - 156/5: 155/4, 1/1
-Text Message
-Begin
-
-
-End
-])
-
-AT_CLEANUP
\ No newline at end of file
diff --git a/libmailutils/tests/mimetest.c b/libmailutils/tests/mimetest.c
deleted file mode 100644
index e440b37..0000000
--- a/libmailutils/tests/mimetest.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2005, 2007, 2009, 2010 Free Software
-   Foundation, Inc.
-
-   GNU Mailutils is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   GNU Mailutils is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GNU Mailutils; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301 USA */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-
-#include <sys/types.h>
-
-#include <mailutils/mailutils.h>
-
-void message_display_parts(mu_message_t msg, int indent);
-
-const char *from;
-const char *subject;
-const char *charset;
-int print_attachments;
-int indent_level = 4;
-
-void
-print_file (const char *fname, int indent)
-{
-  char buf[128];
-  FILE *fp = fopen (fname, "r");
-
-  if (!fp)
-    {
-      fprintf (stderr, "can't open file %s: %s", fname, strerror (errno));
-      return;
-    }
-
-  while (fgets (buf, sizeof buf, fp))
-    printf ("%*.*s%s", indent, indent, "", buf);
-  fclose (fp);
-  unlink (fname);
-}
-
-int
-main (int argc, char **argv)
-{
-  mu_mailbox_t mbox = NULL;
-  size_t i;
-  size_t count = 0;
-  char *mailbox_name;
-  int debug = 0;
-
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], "-d") == 0)
-        debug = 1;
-      else if (strcmp (argv[i], "-p") == 0)
-        print_attachments = 1;
-      else if (strcmp (argv[i], "-i") == 0)
-	{
-	  if (++i == argc)
-	    {
-	      mu_error ("-i requires argument");
-	      exit (1);
-	    }
-	  indent_level = strtoul (argv[i], NULL, 0);
-	}
-      else if (strcmp (argv[i], "-c") == 0)
-	{
-	  if (++i == argc)
-	    {
-	      mu_error ("-c requires argument");
-	      exit (1);
-	    }
-	  charset = argv[i];
-	}
-      else
-        break;
-    }
-
-  mailbox_name = argv[i];
-
-  /* Registration.  */
-  mu_registrar_record (mu_imap_record);
-  mu_registrar_record (mu_pop_record);
-  mu_registrar_record (mu_mbox_record);
-  mu_registrar_set_default_record (mu_mbox_record);
-
-  MU_ASSERT (mu_mailbox_create_default (&mbox, mailbox_name));
-  
-  /* Debugging trace. */
-  if (debug)
-    {
-      mu_debug_t debug;
-      mu_mailbox_get_debug (mbox, &debug);
-      mu_debug_set_level (debug, MU_DEBUG_LEVEL_UPTO (MU_DEBUG_PROT));
-    }
-
-  /* Open the mailbox for reading only.  */
-  MU_ASSERT (mu_mailbox_open (mbox, MU_STREAM_RDWR));
-
-  /* Iterate through the entire message set.  */
-  MU_ASSERT (mu_mailbox_messages_count (mbox, &count));
-
-  for (i = 1; i <= count; ++i)
-    {
-      mu_message_t msg;
-      mu_header_t hdr;
-      size_t nparts;
-      size_t msize, nlines;
-
-      MU_ASSERT (mu_mailbox_get_message (mbox, i, &msg));
-      MU_ASSERT (mu_message_size (msg, &msize));
-      MU_ASSERT (mu_message_lines (msg, &nlines));
-      MU_ASSERT (mu_message_get_header (msg, &hdr));
-      if (mu_header_sget_value (hdr, MU_HEADER_FROM, &from))
-	from = "";
-      if (mu_header_sget_value (hdr, MU_HEADER_SUBJECT, &subject))
-	subject = "";
-      printf ("Message: %lu\n", (unsigned long) i);
-      printf ("From: %s\n", from);
-      printf ("Subject: %s\n", subject);
-
-      MU_ASSERT (mu_message_get_num_parts (msg, &nparts));
-      printf ("Number of parts in message - %lu\n",
-	      (unsigned long) nparts);
-      printf ("Total message size - %lu/%lu\n",
-	      (unsigned long) msize, (unsigned long) nlines);
-      message_display_parts (msg, 0);
-    }
-  mu_mailbox_close (mbox);
-  mu_mailbox_destroy (&mbox);
-  return 0;
-}
-
-char buf[2048];
-
-static void
-print_message_part_sizes (mu_message_t part, int indent)
-{
-  mu_body_t body;
-  mu_header_t hdr;
-  size_t msize, mlines, hsize, hlines, bsize, blines;
-  
-  MU_ASSERT (mu_message_size (part, &msize));
-  MU_ASSERT (mu_message_lines (part, &mlines));
-  MU_ASSERT (mu_message_get_header (part, &hdr));
-  MU_ASSERT (mu_header_size (hdr, &hsize));
-  MU_ASSERT (mu_header_lines (hdr, &hlines));
-  MU_ASSERT (mu_message_get_body (part, &body));
-  MU_ASSERT (mu_body_size (body, &bsize));
-  MU_ASSERT (mu_body_lines (body, &blines));
-  printf ("%*.*sMessage part size - %lu/%lu: %lu/%lu, %lu/%lu\n",
-	  indent, indent, "",
-	  (unsigned long) msize, (unsigned long) mlines,
-	  (unsigned long) hsize, (unsigned long) hlines,
-	  (unsigned long) bsize, (unsigned long) blines);
-}
-  
-void
-message_display_parts (mu_message_t msg, int indent)
-{
-  int ret, j;
-  size_t nparts;
-  mu_message_t part;
-  mu_header_t hdr;
-  mu_stream_t str;
-  mu_body_t body;
-  int ismulti;
-  size_t nbytes;
-
-  /* How many parts does the message has? */
-  if ((ret = mu_message_get_num_parts (msg, &nparts)) != 0)
-    {
-      fprintf (stderr, "mu_message_get_num_parts - %s\n", mu_strerror (ret));
-      exit (2);
-    }
-
-  /* Iterate through all the parts.
-     Treat type "message/rfc822" differently, since it is a message of
-     its own that can have other subparts(recursive). */
-  for (j = 1; j <= nparts; j++)
-    {
-      int status;
-      const char *hvalue;
-      char *type = NULL;
-      const char *encoding = "";
-
-      MU_ASSERT (mu_message_get_part (msg, j, &part));
-      MU_ASSERT (mu_message_get_header (part, &hdr));
-      status = mu_header_sget_value (hdr, MU_HEADER_CONTENT_TYPE,
-				     &hvalue);
-      if (status == MU_ERR_NOENT)
-	/* nothing */;
-      else if (status != 0)
-	mu_error ("Cannot get header value: %s", mu_strerror (status));
-      else
-	{
-	  status = mu_mimehdr_aget_disp (hvalue, &type);
-	  if (status)
-	    mu_error ("Cannot extract content type field: %s",
-		      mu_strerror (status));
-	}
-      printf ("%*.*sType of part %d = %s\n", indent, indent, "",
-	      j, type ? type : "");
-      print_message_part_sizes (part, indent);
-      if (mu_header_sget_value (hdr, MU_HEADER_CONTENT_TRANSFER_ENCODING,
-				&encoding))
-	encoding = "";
-      ismulti = 0;
-      if ((type
-           && mu_c_strcasecmp (type, "message/rfc822") == 0)
-          || (mu_message_is_multipart (part, &ismulti) == 0 && ismulti))
-        {
-          if (!ismulti)
-	    MU_ASSERT (mu_message_unencapsulate (part, &part, NULL));
-	  
-          MU_ASSERT (mu_message_get_header (part, &hdr));
-          if (mu_header_sget_value (hdr, MU_HEADER_FROM, &from))
-	    from = "";
-          if (mu_header_sget_value (hdr, MU_HEADER_SUBJECT, &subject))
-	    subject = "";
-          printf ("%*.*sEncapsulated message : %s\t%s\n",
-                  indent, indent, "", from, subject);
-          printf ("%*.*sBegin\n", indent, indent, "");
-          message_display_parts (part, indent + indent_level);
-          mu_message_destroy (&part, NULL);
-        }
-      else if (!type
-               || (mu_c_strcasecmp (type, "text/plain") == 0)
-               || (mu_c_strcasecmp (type, "text/html")) == 0)
-	{
-	  printf ("%*.*sText Message\n", indent, indent, "");
-          printf ("%*.*sBegin\n", indent, indent, "");
-          mu_message_get_body (part, &body);
-          mu_body_get_streamref (body, &str);
-          /* Make sure the original body stream is not closed when
-             str gets destroyed */
-          mu_filter_create (&str, str, encoding, MU_FILTER_DECODE,
-			    MU_STREAM_READ);
-	  
-	  while (mu_stream_readline (str, buf, sizeof (buf), &nbytes) == 0
-		 && nbytes)
-            {
-              printf ("%*.*s%s", indent, indent, "", buf);
-            }
-          mu_stream_destroy (&str);
-        }
-      else
-        {
-          /* Save the attachements.  */
-          char *fname = NULL;
-
-          mu_message_aget_decoded_attachment_name (part, charset,
-						   &fname, NULL);
-          if (fname == NULL)
-            fname = mu_tempname (NULL);
-
-          printf ("%*.*sAttachment - saving [%s]\n", indent, indent, "",
-                  fname);
-          printf ("%*.*sBegin\n", indent, indent, "");
-          if (charset)
-	    {
-	      mu_mime_io_buffer_t info;
-	      mu_mime_io_buffer_create (&info);
-	      mu_mime_io_buffer_set_charset (info, charset);
-	      MU_ASSERT (mu_message_save_attachment (part, NULL, info));
-	      mu_mime_io_buffer_destroy (&info);
-	    }
-	  else
-	    MU_ASSERT (mu_message_save_attachment (part, fname, NULL));
-          if (print_attachments)
-            print_file (fname, indent);
-          free (fname);
-        }
-      printf ("\n%*.*sEnd\n", indent, indent, "");
-      free (type);
-    }
-}
-
diff --git a/libmailutils/tests/testsuite.at b/libmailutils/tests/testsuite.at
index bbf01e8..1de64b6 100644
--- a/libmailutils/tests/testsuite.at
+++ b/libmailutils/tests/testsuite.at
@@ -57,10 +57,10 @@ AT_INIT
 m4_include([list.at])
 m4_include([address.at])
 m4_include([argcv.at])
-m4_include([mime.at])
 m4_include([url.at])
 m4_include([mailcap.at])
 m4_include([base64e.at])
 m4_include([base64d.at])
 m4_include([decode2047.at])
 m4_include([encode2047.at])
+
diff --git a/libproto/mbox/mbox.c b/libproto/mbox/mbox.c
index 1425358..04e548a 100644
--- a/libproto/mbox/mbox.c
+++ b/libproto/mbox/mbox.c
@@ -120,7 +120,8 @@ mbox_open (mu_mailbox_t mailbox, int flags)
   MU_DEBUG2 (mailbox->debug, MU_DEBUG_TRACE1, "mbox_open (%s, 0x%x)\n",
 	     mud->name, mailbox->flags);
 
-  if (mailbox->locker == NULL)
+  if (mailbox->locker == NULL &&
+      (flags & (MU_STREAM_WRITE | MU_STREAM_APPEND | MU_STREAM_CREAT)))
     status = mu_locker_create (&mailbox->locker, mud->name, 0);
   return status;
 }
@@ -181,7 +182,7 @@ mbox_remove (mu_mailbox_t mailbox)
 
   MU_DEBUG1 (mailbox->debug, MU_DEBUG_TRACE1,
 	     "mbox_remove (%s)\n", mud->name);
-  return unlink (mud->name);
+  return unlink (mud->name) == 0 ? 0 : errno;
 }
 
 /* Cover function that calls the real thing, mbox_scan(), with
@@ -1117,7 +1118,8 @@ mbox_append_message (mu_mailbox_t mailbox, mu_message_t msg)
   MU_DEBUG1 (mailbox->debug, MU_DEBUG_TRACE1, "mbox_append_message (%s)\n",
 	     mud->name);
 
-  if ((status = mu_locker_lock (mailbox->locker)) != 0)
+  if (mailbox->locker &&
+      (status = mu_locker_lock (mailbox->locker)) != 0)
     {
       MU_DEBUG1 (mailbox->debug, MU_DEBUG_TRACE1,
 		 "mbox_append_message: %s\n", mu_strerror(status));
@@ -1128,7 +1130,8 @@ mbox_append_message (mu_mailbox_t mailbox, mu_message_t msg)
   if (status)
     return status;
   status = append_message_to_stream (mailbox->stream, msg, mud, 0);
-  mu_locker_unlock (mailbox->locker);
+  if (mailbox->locker)
+    mu_locker_unlock (mailbox->locker);
 
   if (status)
     {
@@ -1406,7 +1409,8 @@ mbox_expunge0 (mu_mailbox_t mailbox, int remove_deleted)
     return 0; /* Nothing changed.  */
 
   /* Lock the mailbox */
-  if ((status = mu_locker_lock (mailbox->locker)) != 0)
+  if (mailbox->locker &&
+      (status = mu_locker_lock (mailbox->locker)) != 0)
     return status;
 
   status = mu_temp_file_stream_create (&tempstr, NULL);
@@ -1442,7 +1446,8 @@ mbox_expunge0 (mu_mailbox_t mailbox, int remove_deleted)
 	    mbox_reset (mailbox, dirty, remove_deleted);
 	}
     }
-  mu_locker_unlock (mailbox->locker);
+  if (mailbox->locker)
+    mu_locker_unlock (mailbox->locker);
   return status;
 }
 
diff --git a/libproto/mbox/mboxscan.c b/libproto/mbox/mboxscan.c
index db8a099..cb804c7 100644
--- a/libproto/mbox/mboxscan.c
+++ b/libproto/mbox/mboxscan.c
@@ -209,7 +209,8 @@ do                                                                            \
     }                                                                         \
   if (bailing != 0)                                                           \
     {                                                                         \
-      mu_locker_unlock (mbox->locker);                                        \
+      if (mailbox->locker)						      \
+	mu_locker_unlock (mbox->locker);				      \
       return EINTR;                                                           \
     }                                                                         \
   mu_monitor_wrlock (mbox->monitor);                                          \
@@ -232,8 +233,9 @@ do                                                                           \
                                     MU_EVT_MAILBOX_PROGRESS, NULL);          \
   if (bailing != 0)                                                          \
     {	                                                                     \
-       mu_locker_unlock (mbox->locker);                                      \
-       return EINTR;                                                         \
+      if (mailbox->locker)						     \
+	mu_locker_unlock (mbox->locker);				     \
+      return EINTR;							     \
     }                                                                        \
   mud->messages_count++;                                                     \
   mu_monitor_wrlock (mbox->monitor);                                         \
@@ -251,7 +253,8 @@ do                                                                           \
       m = realloc ((mud)->umessages, num * sizeof (*m));                     \
     if (m == NULL)                                                           \
       {                                                                      \
-        mu_locker_unlock (mbox->locker);                                     \
+	if (mailbox->locker)						     \
+	  mu_locker_unlock (mbox->locker);				     \
         mu_monitor_unlock (mbox->monitor);                                   \
         return ENOMEM;                                                       \
       }                                                                      \
@@ -259,7 +262,8 @@ do                                                                           \
     (mud)->umessages[num - 1] = calloc (1, sizeof (*(mum)));                 \
     if ((mud)->umessages[num - 1] == NULL)                                   \
       {                                                                      \
-        mu_locker_unlock (mbox->locker);                                     \
+	if (mailbox->locker)						     \
+	  mu_locker_unlock (mbox->locker);				     \
         mu_monitor_unlock (mbox->monitor);                                   \
         return ENOMEM;                                                       \
       }                                                                      \
@@ -391,7 +395,7 @@ mbox_scan_internal (mu_mailbox_t mailbox, mbox_message_t mum,
       newline = (inbody && lines) ? nl : 0;
       
       /* Every 100 mesgs update the lock, it should be every minute.  */
-      if ((mud->messages_count % 100) == 0)
+      if (mailbox->locker && (mud->messages_count % 100) == 0)
 	mu_locker_touchlock (mailbox->locker);
 
       /* Ping them every 1000 lines. Should be tunable.  */
@@ -454,7 +458,8 @@ mbox_scan0 (mu_mailbox_t mailbox, size_t msgno, size_t *pcount, int do_notif)
       return status;
     }
 
-  if ((status = mu_locker_lock (mailbox->locker)))
+  if (mailbox->locker &&
+      (status = mu_locker_lock (mailbox->locker)))
     {
       mu_monitor_unlock (mailbox->monitor);
       return status;
@@ -477,7 +482,8 @@ mbox_scan0 (mu_mailbox_t mailbox, size_t msgno, size_t *pcount, int do_notif)
     
   if (pcount)
     *pcount = mud->messages_count;
-  mu_locker_unlock (mailbox->locker);
+  if (mailbox->locker)
+    mu_locker_unlock (mailbox->locker);
   mu_monitor_unlock (mailbox->monitor);
 
   /* Reset the uidvalidity.  */
@@ -525,7 +531,8 @@ mbox_scan1 (mu_mailbox_t mailbox, mu_off_t offset, int do_notif)
   pthread_cleanup_push (mbox_cleanup, (void *)mailbox);
 #endif
 
-  if ((status = mu_locker_lock (mailbox->locker)))
+  if (mailbox->locker &&
+      (status = mu_locker_lock (mailbox->locker)))
     {
       mu_monitor_unlock (mailbox->monitor);
       return status;
@@ -535,7 +542,8 @@ mbox_scan1 (mu_mailbox_t mailbox, mu_off_t offset, int do_notif)
   if (status)
     {
       mu_monitor_unlock (mailbox->monitor);
-      mu_locker_unlock (mailbox->locker);
+      if (mailbox->locker)
+	mu_locker_unlock (mailbox->locker);
       return status;
     }
 
@@ -543,7 +551,8 @@ mbox_scan1 (mu_mailbox_t mailbox, mu_off_t offset, int do_notif)
 			       MBOX_SCAN_ONEMSG |
 			       (do_notif ? MBOX_SCAN_NOTIFY : 0));
 
-  mu_locker_unlock (mailbox->locker);
+  if (mailbox->locker)
+    mu_locker_unlock (mailbox->locker);
   mu_monitor_unlock (mailbox->monitor);
   
 #ifdef WITH_PTHREAD
diff --git a/messages/tests/atlocal.in b/messages/tests/atlocal.in
index 31b50ea..98f8248 100644
--- a/messages/tests/atlocal.in
+++ b/messages/tests/atlocal.in
@@ -3,7 +3,4 @@
 # Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@:@abs_top_builddir@/messages:$top_srcdir:$srcdir:$PATH
-top_srcdir=@abs_top_srcdir@
-top_builddir=@abs_top_builddir@
-
-  
\ No newline at end of file
+  
diff --git a/messages/tests/testsuite.at b/messages/tests/testsuite.at
index fe0eaca..04ff126 100644
--- a/messages/tests/testsuite.at
+++ b/messages/tests/testsuite.at
@@ -33,7 +33,7 @@ m4_define([MSGTEST],[
 AT_SETUP([$1])
 AT_KEYWORDS([messages $2])
 AT_CHECK([
-MAIL=$top_srcdir/testsuite/spool/MSG_MAILBOX
+MAIL=$abs_top_srcdir/testsuite/spool/MSG_MAILBOX
 FOLDER=$MAIL
 export MAIL FOLDER
 messages MSG_OPTIONS $3 | sed 's|in /.*/|in |'],
@@ -59,7 +59,7 @@ MSGTEST([messages -q],[messages01 messages-q],
 ])
 
 MSGTEST([messages 2],[messages02],
-[--set ":mailbox:folder=$top_srcdir/testsuite/spool" +teaparty.mbox],
+[--set ":mailbox:folder=$abs_top_srcdir/testsuite/spool" +teaparty.mbox],
 [0],
 [Number of messages in teaparty.mbox: 95
 ])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1f3ad0a..de5feee 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -123,25 +123,25 @@ mail/unalias.c
 mail/util.c
 mail/z.c
 
-mailbox/cfg_driver.c
-mailbox/cfg_format.c
-mailbox/cfg_lexer.l
-mailbox/cfg_parser.y
-mailbox/debug.c
-mailbox/diag.c
-mailbox/errors
-mailbox/file_stream.c
-mailbox/filter_iconv.c
-mailbox/gdebug.c
-mailbox/gocs.c
-mailbox/ipsrv.c
-mailbox/message.c
-mailbox/msrv.c
-mailbox/mu_auth.c
-mailbox/mutil.c
-mailbox/parsedate.y
-mailbox/registrar.c
-mailbox/version.c
+libmailutils/cfg_driver.c
+libmailutils/cfg_format.c
+libmailutils/cfg_lexer.l
+libmailutils/cfg_parser.y
+libmailutils/debug.c
+libmailutils/diag.c
+libmailutils/errors
+libmailutils/file_stream.c
+libmailutils/filter_iconv.c
+libmailutils/gdebug.c
+libmailutils/gocs.c
+libmailutils/ipsrv.c
+libmailutils/message.c
+libmailutils/msrv.c
+libmailutils/mu_auth.c
+libmailutils/mutil.c
+libmailutils/parsedate.y
+libmailutils/registrar.c
+libmailutils/version.c
 
 messages/messages.c
 
diff --git a/readmsg/tests/atlocal.in b/readmsg/tests/atlocal.in
index aa0ba44..8464498 100644
--- a/readmsg/tests/atlocal.in
+++ b/readmsg/tests/atlocal.in
@@ -3,5 +3,3 @@
 # Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@:@abs_top_builddir@/readmsg:$top_srcdir:$srcdir:$PATH
-top_srcdir=@abs_top_srcdir@
-top_builddir=@abs_top_builddir@
diff --git a/readmsg/tests/testsuite.at b/readmsg/tests/testsuite.at
index beef5f9..e905637 100644
--- a/readmsg/tests/testsuite.at
+++ b/readmsg/tests/testsuite.at
@@ -34,7 +34,7 @@ m4_define([READMSGTEST],[
 AT_SETUP([$1])
 AT_KEYWORDS([$2])
 AT_CHECK([
-MAIL=$top_srcdir/testsuite/spool/READMSG_MAILBOX
+MAIL=$abs_top_srcdir/testsuite/spool/READMSG_MAILBOX
 FOLDER=$MAIL
 export MAIL FOLDER
 readmsg READMSG_OPTIONS $3],
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index d2354bd..8a6eda2 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -19,6 +19,7 @@
 
 INCLUDES = @MU_APP_COMMON_INCLUDES@ 
 SUBDIRS  = tests
+EXTRA_DIST = examples
 
 bin_PROGRAMS = sieve
 sieve_SOURCES = sieve.c
diff --git a/sieve/tests/atlocal.in b/sieve/tests/atlocal.in
index 19343df..a50bc9c 100644
--- a/sieve/tests/atlocal.in
+++ b/sieve/tests/atlocal.in
@@ -3,12 +3,3 @@
 # Copyright (C) 2004, 2010 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@:@abs_top_builddir@/sieve:$top_srcdir:$srcdir:$PATH
-top_srcdir=@abs_top_srcdir@
-top_builddir=@abs_top_builddir@
-
-initspool() {
-  test -d data || mkdir data
-  test -d data/spool || mkdir data/spool
-  cp $top_srcdir/testsuite/spool/* data/spool
-}
-  
\ No newline at end of file
diff --git a/sieve/tests/ext.at b/sieve/tests/ext.at
index 9e16f9d..e53561a 100644
--- a/sieve/tests/ext.at
+++ b/sieve/tests/ext.at
@@ -30,10 +30,11 @@ if numaddr [[ "to", "cc" ]] :over 5
   }
 ])
 
-cp $top_srcdir/testsuite/spool/bigto.mbox .
+cp $abs_top_srcdir/testsuite/spool/bigto.mbox .
+chmod +w bigto.mbox
 
 sieve MUT_SIEVE_CMDLINE dnl
- --clearpath -L "${top_builddir}/examples" -f ./bigto.mbox prog
+ --clearpath -L "${abs_top_builddir}/examples" -f ./bigto.mbox prog
 ],
 [0],
 [],
diff --git a/sieve/tests/redirect.at b/sieve/tests/redirect.at
index 7044ba6..e51320d 100644
--- a/sieve/tests/redirect.at
+++ b/sieve/tests/redirect.at
@@ -29,7 +29,8 @@ require "redirect";
 
 redirect "[email protected]";
 ])
-cp $top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
+cp $abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
+chmod +w MUT_SIEVE_MAILBOX
 
 sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f ./MUT_SIEVE_MAILBOX prog || exit 1
 sed 's/ $//' ./mta.diag
diff --git a/sieve/tests/reject.at b/sieve/tests/reject.at
index 3e531b7..6685a2e 100644
--- a/sieve/tests/reject.at
+++ b/sieve/tests/reject.at
@@ -46,7 +46,8 @@ s/^\( *[[0-9]][[0-9]]*: The original message was received at *\).*\( from .*\)/\
 s/^\( *[[0-9]][[0-9]]*: Last-Attempt-Date:\).*/\1 (date)/
 ])
 
-cp $top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
+cp $abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
+chmod +w MUT_SIEVE_MAILBOX
 
 sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f ./MUT_SIEVE_MAILBOX prog || exit 1
 sed -f filter.sed ./mta.diag
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index c0bb825..26c0211 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -22,7 +22,7 @@ dnl testcompile(SCRIPT) -- test compilation of the Sieve SCRIPT
 dnl
 m4_define([testcompile],[
 AT_SETUP([compile $1])
-AT_CHECK([sieve -c $top_srcdir/sieve/examples/$1],
+AT_CHECK([sieve -c $abs_top_srcdir/sieve/examples/$1],
 [0])
 AT_CLEANUP
 ])
@@ -42,7 +42,7 @@ m4_define([MUT_SIEVE_CMDLINE],[dnl
  --no-program-name dnl
  --no-site-config dnl
  --no-user-config dnl
- -M sendmail:$top_builddir/examples/mta dnl
+ -M sendmail:$abs_top_builddir/examples/mta dnl
  --email [email protected]])
  
 dnl ------------------------------------------------------------
@@ -70,7 +70,9 @@ AT_CHECK([sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f $2 prog
 m4_define([MUT_TESTCASE],[
 AT_SETUP([$1])
 AT_KEYWORDS([$2])
-cp $top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
+cp $abs_top_srcdir/testsuite/spool/MUT_SIEVE_MAILBOX .
+chmod +w MUT_SIEVE_MAILBOX
+
 MUT_SIEVE_RUN([$3], ./MUT_SIEVE_MAILBOX, m4_shift(m4_shift(m4_shift($@))))
 AT_CLEANUP])
 
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 282522d..152a8be 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1,2 +1,8 @@
-Makefile
-Makefile.in
+atconfig
+atlocal
+package.m4
+testsuite
+testsuite.dir
+testsuite.log
+mbdel
+mimetest
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 5182ae0..bbe2493 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -1,46 +1,88 @@
-## Process this file with GNU Automake to create Makefile.in
-
-##   Copyright (C) 2002, 2007, 2010 Free Software Foundation, Inc.
-##
-##   GNU Mailutils is free software; you can redistribute it and/or
-##   modify it under the terms of the GNU General Public License as
-##   published by the Free Software Foundation; either version 3, or (at
-##   your option) any later version.
-##
-##   This program is distributed in the hope that it will be useful, but
-##   WITHOUT ANY WARRANTY; without even the implied warranty of
-##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-##   General Public License for more details.
-##
-##   You should have received a copy of the GNU General Public License
-##   along with this program; if not, write to the Free Software
-##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
-##   02110-1301 USA
-
-test_dirs = lib etc spool folder
-
-dist-hook:
-	@here=`cd $(top_builddir)/$(subdir) && pwd`; \
-	srcdir=`cd $(srcdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	for dir in $(test_dirs); \
-	do \
-            cd $$srcdir;\
-            mkdir $$distdir/$$dir;\
-	    cd $$dir;\
-	    for file in DISTFILES `cat DISTFILES`; do \
-	        d=$$srcdir/$$dir; \
-	        if test -d $$d/$$file; then \
-                    cp -pr $$d/$$file $$distdir/$$dir/$$file; \
-		else \
-	            test -f $$distdir/$$dir/$$file \
-                        || cp -p $$d/$$file $$distdir/$$dir/$$file || exit; \
-                fi; \
-	    done;\
-        done;\
-	cd $$here
-
-DISTCLEANFILES=*.exp *.log *.sum 
-
-distclean-local:
-	-rm -rf	data
+# This file is part of GNU Mailutils.
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 lib etc spool folder maildir mh
+DISTCLEANFILES       = atconfig $(check_SCRIPTS)
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	$(AM_V_GEN){                                      \
+	  echo '# Signature of the current package.'; \
+	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >$(srcdir)/package.m4
+
+#
+
+## -------------------------- ##
+## Non-installable programs
+## -------------------------- ##
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
+noinst_PROGRAMS = \
+ mbdel\
+ mimetest
+
+LDADD = \
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_MAILER}\
+ ${MU_LIB_AUTH}\
+ @MU_AUTHLIBS@\
+ ${MU_LIB_MAILUTILS}
+
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
+TESTSUITE_AT = \
+ mbdel.at\
+ mime.at\
+ testsuite.at
+
+TESTSUITE = $(srcdir)/testsuite
+M4=m4
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o [email protected]
+	$(AM_V_at)mv [email protected] $@
+
+atconfig: $(top_builddir)/config.status
+	cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE) 
+	@$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+#installcheck-local:
+#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+
+
diff --git a/testsuite/atlocal.in b/testsuite/atlocal.in
new file mode 100644
index 0000000..0839e09
--- /dev/null
+++ b/testsuite/atlocal.in
@@ -0,0 +1,5 @@
+# @configure_input@                                     -*- shell-script -*-
+# Configurable variable values for Mailutils test suite.
+# Copyright (C) 2004, 2010 Free Software Foundation, Inc.
+
+PATH=@abs_builddir@:@abs_top_builddir@/libtests:$top_srcdir:$srcdir:$PATH
diff --git a/testsuite/etc/DISTFILES b/testsuite/etc/DISTFILES
deleted file mode 100644
index 2dadd8b..0000000
--- a/testsuite/etc/DISTFILES
+++ /dev/null
@@ -1,3 +0,0 @@
-mail.rc
-passwd.in
-mailutils.rc.in
diff --git a/testsuite/lib/DISTFILES b/testsuite/lib/DISTFILES
deleted file mode 100644
index 805b653..0000000
--- a/testsuite/lib/DISTFILES
+++ /dev/null
@@ -1 +0,0 @@
-mailutils.exp
diff --git a/testsuite/maildir/mbox1/new/1284628225.M17468P3883Q0.Trurl b/testsuite/maildir/mbox1/new/1284628225.M17468P3883Q0.Trurl
new file mode 100644
index 0000000..421117e
--- /dev/null
+++ b/testsuite/maildir/mbox1/new/1284628225.M17468P3883Q0.Trurl
@@ -0,0 +1,47 @@
+Received: (from [email protected])
+	by nonexistent.net id fBSKI8N04906
+	for [email protected]; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 22:18:08 +0200
+From: Foo Bar <[email protected]>
+Message-Id: <[email protected]>
+To: Bar <[email protected]>
+Subject: Jabberwocky
+X-IMAPbase: 0 1
+X-Envelope-Date: Fri Dec 28 22:18:09 2001
+X-Envelope-Sender: [email protected]
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two!  One, two!  And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day!  Calloh!  Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
diff --git a/testsuite/maildir/mbox1/new/1284628225.M19181P3883Q1.Trurl b/testsuite/maildir/mbox1/new/1284628225.M19181P3883Q1.Trurl
new file mode 100644
index 0000000..4153198
--- /dev/null
+++ b/testsuite/maildir/mbox1/new/1284628225.M19181P3883Q1.Trurl
@@ -0,0 +1,15 @@
+Received: (from [email protected])
+	by dontmailme.org id fERKR9N16790
+	for [email protected]; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <[email protected]>
+To: Foo Bar <[email protected]>
+Message-Id: <[email protected]>
+Subject: Re: Jabberwocky
+X-Envelope-Date: Fri Dec 28 23:28:09 2001
+X-Envelope-Sender: [email protected]
+
+It seems very pretty, but it's *rather* hard to understand!'
+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...
diff --git a/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl b/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
new file mode 100644
index 0000000..2efcb9e
--- /dev/null
+++ b/testsuite/maildir/mbox1/new/1284628225.M20118P3883Q2.Trurl
@@ -0,0 +1,44 @@
+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]>
+To: Foo Bar <[email protected]>
+Subject: Simple MIME
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <[email protected]>
+Date: Sat, 13 Jul 2002 00:43:18 +0300
+From: Sergey Poznyakoff <[email protected]>
+X-Envelope-Date: Sat Jul 13 00:43:18 2002
+X-Envelope-Sender: [email protected]
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="msg.1"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: How doth
+
+How doth the little crocodile
+Improve his shining tail,
+And pour the waters of the Nile
+On every golden scale!
+
+`How cheerfully he seems to grin,
+How neatly spread his claws,
+And welcome little fishes in
+With gently smiling jaws!
+
+------- =_aaaaaaaaaa0
+Content-Type: application/octet-stream; name="msg.21"
+Content-ID: <[email protected]>
+Content-Description: Father William Part I
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCBGYXRoZXIgV2lsbGlhbSwnIHRoZSB5b3VuZyBtYW4gc2FpZCwKYEFuZCB5
+b3VyIGhhaXIgaGFzIGJlY29tZSB2ZXJ5IHdoaXRlOwpBbmQgeWV0IHlvdSBpbmNlc3NhbnRseSBz
+dGFuZCBvbiB5b3VyIGhlYWQtLQpEbyB5b3UgdGhpbmssIGF0IHlvdXIgYWdlLCBpdCBpcyByaWdo
+dD8nCgpgSW4gbXkgeW91dGgsJyBGYXRoZXIgV2lsbGlhbSByZXBsaWVkIHRvIGhpcyBzb24sCmBJ
+IGZlYXJlZCBpdCBtaWdodCBpbmp1cmUgdGhlIGJyYWluOwpCdXQsIG5vdyB0aGF0IEknbSBwZXJm
+ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
+
+------- =_aaaaaaaaaa0--
diff --git a/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl b/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
new file mode 100644
index 0000000..4763565
--- /dev/null
+++ b/testsuite/maildir/mbox1/new/1284628225.M21284P3883Q3.Trurl
@@ -0,0 +1,86 @@
+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]>
+To: Foo Bar <[email protected]>
+Subject: Nested MIME
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <[email protected]>
+Date: Sat, 13 Jul 2002 00:50:58 +0300
+From: Sergey Poznyakoff <[email protected]>
+X-Envelope-Date: Sat Jul 13 00:50:58 2002
+X-Envelope-Sender: [email protected]
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="msg.21"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: Father William Part I
+
+`You are old, Father William,' the young man said,
+`And your hair has become very white;
+And yet you incessantly stand on your head--
+Do you think, at your age, it is right?'
+
+`In my youth,' Father William replied to his son,
+`I feared it might injure the brain;
+But, now that I'm perfectly sure I have none,
+Why, I do it again and again.'
+
+
+------- =_aaaaaaaaaa0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
+Content-ID: <[email protected]>
+
+------- =_aaaaaaaaaa1
+Content-Type: application/octet-stream; name="msg.22"
+Content-ID: <[email protected]>
+Content-Description: Father William Part II
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhcyBJIG1lbnRpb25lZCBiZWZvcmUsCkFu
+ZCBoYXZlIGdyb3duIG1vc3QgdW5jb21tb25seSBmYXQ7CllldCB5b3UgdHVybmVkIGEgYmFjay1z
+b21lcnNhdWx0IGluIGF0IHRoZSBkb29yLS0KUHJheSwgd2hhdCBpcyB0aGUgcmVhc29uIG9mIHRo
+YXQ/JwoKYEluIG15IHlvdXRoLCcgc2FpZCB0aGUgc2FnZSwgYXMgaGUgc2hvb2sgaGlzIGdyZXkg
+bG9ja3MsCmBJIGtlcHQgYWxsIG15IGxpbWJzIHZlcnkgc3VwcGxlCkJ5IHRoZSB1c2Ugb2YgdGhp
+cyBvaW50bWVudC0tb25lIHNoaWxsaW5nIHRoZSBib3gtLQpBbGxvdyBtZSB0byBzZWxsIHlvdSBh
+IGNvdXBsZT8nCg==
+
+------- =_aaaaaaaaaa1
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
+Content-ID: <[email protected]>
+
+------- =_aaaaaaaaaa2
+Content-Type: application/octet-stream; name="msg.23"
+Content-ID: <[email protected]>
+Content-Description: Father William Part III
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh
+awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv
+b3NlLCB3aXRoIHRoZSBib25lcyBhbmQgdGhlIGJlYWstLQpQcmF5IGhvdyBkaWQgeW91IG1hbmFn
+ZSB0byBkbyBpdD8nCgpgSW4gbXkgeW91dGgsJyBzYWlkIGhpcyBmYXRoZXIsIGBJIHRvb2sgdG8g
+dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1
+bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz
+dCBvZiBteSBsaWZlLicK
+
+------- =_aaaaaaaaaa2
+Content-Type: application/octet-stream; name="msg.24"
+Content-ID: <[email protected]>
+Content-Description: Father William Part IV
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBvbmUgd291bGQgaGFyZGx5IHN1cHBvc2UK
+VGhhdCB5b3VyIGV5ZSB3YXMgYXMgc3RlYWR5IGFzIGV2ZXI7CllldCB5b3UgYmFsYW5jZWQgYW4g
+ZWVsIG9uIHRoZSBlbmQgb2YgeW91ciBub3NlLS0KV2hhdCBtYWRlIHlvdSBzbyBhd2Z1bGx5IGNs
+ZXZlcj8nCgpgSSBoYXZlIGFuc3dlcmVkIHRocmVlIHF1ZXN0aW9ucywgYW5kIHRoYXQgaXMgZW5v
+dWdoLCcKU2FpZCBoaXMgZmF0aGVyOyBgZG9uJ3QgZ2l2ZSB5b3Vyc2VsZiBhaXJzIQpEbyB5b3Ug
+dGhpbmsgSSBjYW4gbGlzdGVuIGFsbCBkYXkgdG8gc3VjaCBzdHVmZj8KQmUgb2ZmLCBvciBJJ2xs
+IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
+
+------- =_aaaaaaaaaa2--
+
+------- =_aaaaaaaaaa1--
+
+------- =_aaaaaaaaaa0--
diff --git a/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl b/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
new file mode 100644
index 0000000..660803f
--- /dev/null
+++ b/testsuite/maildir/mbox1/new/1284628225.M22502P3883Q4.Trurl
@@ -0,0 +1,29 @@
+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]>
+To: Foo Bar <[email protected]>
+Subject: Empty MIME Parts
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <[email protected]>
+Date: Sat, 13 Jul 2002 00:43:18 +0300
+From: Sergey Poznyakoff <[email protected]>
+X-Envelope-Date: Sat Jul 13 00:43:18 2002
+X-Envelope-Sender: [email protected]
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="empty"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: Empty part
+
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="single.line"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: Single line part
+
+
+
+------- =_aaaaaaaaaa0--
diff --git a/testsuite/maildir/teaparty/new/1284627340.M261723P3770Q0.Trurl b/testsuite/maildir/teaparty/new/1284627340.M261723P3770Q0.Trurl
new file mode 100644
index 0000000..734ccc9
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M261723P3770Q0.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3301
+	for [email protected]; Mon, 29 Jul 2002 22:00:06 +0100
+Date: Mon, 29 Jul 2002 22:00:01 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Invitation
+X-IMAPbase: 0 1
+X-Envelope-Date: Mon Jul 29 22:00:08 2002
+X-Envelope-Sender: [email protected]
+
+Have some wine
diff --git a/testsuite/maildir/teaparty/new/1284627340.M264198P3770Q1.Trurl b/testsuite/maildir/teaparty/new/1284627340.M264198P3770Q1.Trurl
new file mode 100644
index 0000000..8198cde
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M264198P3770Q1.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3302
+	for [email protected]; Mon, 29 Jul 2002 22:00:07 +0100
+Date: Mon, 29 Jul 2002 22:00:02 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:09 2002
+X-Envelope-Sender: [email protected]
+
+I don't see any wine
diff --git a/testsuite/maildir/teaparty/new/1284627340.M265222P3770Q2.Trurl b/testsuite/maildir/teaparty/new/1284627340.M265222P3770Q2.Trurl
new file mode 100644
index 0000000..89f6c97
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M265222P3770Q2.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3303
+	for [email protected]; Mon, 29 Jul 2002 22:00:08 +0100
+Date: Mon, 29 Jul 2002 22:00:03 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:10 2002
+X-Envelope-Sender: [email protected]
+
+There isn't any
diff --git a/testsuite/maildir/teaparty/new/1284627340.M266132P3770Q3.Trurl b/testsuite/maildir/teaparty/new/1284627340.M266132P3770Q3.Trurl
new file mode 100644
index 0000000..08d2364
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M266132P3770Q3.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3304
+	for [email protected]; Mon, 29 Jul 2002 22:00:09 +0100
+Date: Mon, 29 Jul 2002 22:00:04 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:11 2002
+X-Envelope-Sender: [email protected]
+
+Then it wasn't very civil of you to offer it
diff --git a/testsuite/maildir/teaparty/new/1284627340.M267354P3770Q4.Trurl b/testsuite/maildir/teaparty/new/1284627340.M267354P3770Q4.Trurl
new file mode 100644
index 0000000..3055873
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M267354P3770Q4.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3305
+	for [email protected]; Mon, 29 Jul 2002 22:00:10 +0100
+Date: Mon, 29 Jul 2002 22:00:05 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:12 2002
+X-Envelope-Sender: [email protected]
+
+It wasn't very civil of you to sit down without being invited
diff --git a/testsuite/maildir/teaparty/new/1284627340.M268283P3770Q5.Trurl b/testsuite/maildir/teaparty/new/1284627340.M268283P3770Q5.Trurl
new file mode 100644
index 0000000..485ed70
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M268283P3770Q5.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3306
+	for [email protected]; Mon, 29 Jul 2002 22:00:11 +0100
+Date: Mon, 29 Jul 2002 22:00:06 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:13 2002
+X-Envelope-Sender: [email protected]
+
+I didn't know it was YOUR table, it's laid for a
+great many more than three.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M269180P3770Q6.Trurl b/testsuite/maildir/teaparty/new/1284627340.M269180P3770Q6.Trurl
new file mode 100644
index 0000000..a400f0c
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M269180P3770Q6.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3307
+	for [email protected]; Mon, 29 Jul 2002 22:00:12 +0100
+Date: Mon, 29 Jul 2002 22:00:07 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Personal remark
+X-Envelope-Date: Mon Jul 29 22:00:14 2002
+X-Envelope-Sender: [email protected]
+
+Your hair wants cutting
diff --git a/testsuite/maildir/teaparty/new/1284627340.M270581P3770Q7.Trurl b/testsuite/maildir/teaparty/new/1284627340.M270581P3770Q7.Trurl
new file mode 100644
index 0000000..9a9d536
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M270581P3770Q7.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3308
+	for [email protected]; Mon, 29 Jul 2002 22:00:13 +0100
+Date: Mon, 29 Jul 2002 22:00:08 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Personal remark
+X-Envelope-Date: Mon Jul 29 22:00:15 2002
+X-Envelope-Sender: [email protected]
+
+You should learn not to make personal remarks, it's very rude.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M271932P3770Q8.Trurl b/testsuite/maildir/teaparty/new/1284627340.M271932P3770Q8.Trurl
new file mode 100644
index 0000000..e355ebb
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M271932P3770Q8.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3309
+	for [email protected]; Mon, 29 Jul 2002 22:00:14 +0100
+Date: Mon, 29 Jul 2002 22:00:09 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Riddle (was Re: Personal remark)
+X-Envelope-Date: Mon Jul 29 22:00:16 2002
+X-Envelope-Sender: [email protected]
+
+Why is a raven like a writing-desk?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M273616P3770Q9.Trurl b/testsuite/maildir/teaparty/new/1284627340.M273616P3770Q9.Trurl
new file mode 100644
index 0000000..bc92010
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M273616P3770Q9.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3310
+	for [email protected]; Mon, 29 Jul 2002 22:00:15 +0100
+Date: Mon, 29 Jul 2002 22:00:10 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:17 2002
+X-Envelope-Sender: [email protected]
+
+I believe I can guess that
diff --git a/testsuite/maildir/teaparty/new/1284627340.M275152P3770Q10.Trurl b/testsuite/maildir/teaparty/new/1284627340.M275152P3770Q10.Trurl
new file mode 100644
index 0000000..1b44eac
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M275152P3770Q10.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3311
+	for [email protected]; Mon, 29 Jul 2002 22:00:16 +0100
+Date: Mon, 29 Jul 2002 22:00:11 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:18 2002
+X-Envelope-Sender: [email protected]
+
+Do you mean that you think you can find out the answer to it?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M276269P3770Q11.Trurl b/testsuite/maildir/teaparty/new/1284627340.M276269P3770Q11.Trurl
new file mode 100644
index 0000000..8900979
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M276269P3770Q11.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3312
+	for [email protected]; Mon, 29 Jul 2002 22:00:17 +0100
+Date: Mon, 29 Jul 2002 22:00:12 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:19 2002
+X-Envelope-Sender: [email protected]
+
+Exactly so
diff --git a/testsuite/maildir/teaparty/new/1284627340.M277302P3770Q12.Trurl b/testsuite/maildir/teaparty/new/1284627340.M277302P3770Q12.Trurl
new file mode 100644
index 0000000..0e5e574
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M277302P3770Q12.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3313
+	for [email protected]; Mon, 29 Jul 2002 22:00:18 +0100
+Date: Mon, 29 Jul 2002 22:00:13 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Be specific (was Re: Riddle)
+X-Envelope-Date: Mon Jul 29 22:00:20 2002
+X-Envelope-Sender: [email protected]
+
+Then you should say what you mean
diff --git a/testsuite/maildir/teaparty/new/1284627340.M278391P3770Q13.Trurl b/testsuite/maildir/teaparty/new/1284627340.M278391P3770Q13.Trurl
new file mode 100644
index 0000000..1515693
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M278391P3770Q13.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3314
+	for [email protected]; Mon, 29 Jul 2002 22:00:19 +0100
+Date: Mon, 29 Jul 2002 22:00:14 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:21 2002
+X-Envelope-Sender: [email protected]
+
+I do, at least--at least I mean what
+I say--that's the same thing, you know.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M279592P3770Q14.Trurl b/testsuite/maildir/teaparty/new/1284627340.M279592P3770Q14.Trurl
new file mode 100644
index 0000000..1fd85b4
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M279592P3770Q14.Trurl
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3315
+	for [email protected]; Mon, 29 Jul 2002 22:00:20 +0100
+Date: Mon, 29 Jul 2002 22:00:15 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:22 2002
+X-Envelope-Sender: [email protected]
+
+Not the same thing a bit! You might just
+as well say that "I see what I eat" is the same thing as "I eat
+what I see"!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M280629P3770Q15.Trurl b/testsuite/maildir/teaparty/new/1284627340.M280629P3770Q15.Trurl
new file mode 100644
index 0000000..f8e35ff
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M280629P3770Q15.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3316
+	for [email protected]; Mon, 29 Jul 2002 22:00:21 +0100
+Date: Mon, 29 Jul 2002 22:00:16 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:23 2002
+X-Envelope-Sender: [email protected]
+
+You might just as well say, that "I
+like what I get" is the same thing as "I get what I like"!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M281734P3770Q16.Trurl b/testsuite/maildir/teaparty/new/1284627340.M281734P3770Q16.Trurl
new file mode 100644
index 0000000..068ed33
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M281734P3770Q16.Trurl
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3317
+	for [email protected]; Mon, 29 Jul 2002 22:00:22 +0100
+Date: Mon, 29 Jul 2002 22:00:17 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:24 2002
+X-Envelope-Sender: [email protected]
+
+You might just as well say, who seemed to
+be talking in his sleep, `that "I breathe when I sleep" is the
+same thing as "I sleep when I breathe"!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M282948P3770Q17.Trurl b/testsuite/maildir/teaparty/new/1284627340.M282948P3770Q17.Trurl
new file mode 100644
index 0000000..49487a7
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M282948P3770Q17.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3318
+	for [email protected]; Mon, 29 Jul 2002 22:00:23 +0100
+Date: Mon, 29 Jul 2002 22:00:18 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:25 2002
+X-Envelope-Sender: [email protected]
+
+It IS the same thing with you
diff --git a/testsuite/maildir/teaparty/new/1284627340.M284181P3770Q18.Trurl b/testsuite/maildir/teaparty/new/1284627340.M284181P3770Q18.Trurl
new file mode 100644
index 0000000..7dcf412
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M284181P3770Q18.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3319
+	for [email protected]; Mon, 29 Jul 2002 22:00:24 +0100
+Date: Mon, 29 Jul 2002 22:00:19 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Watch
+X-Envelope-Date: Mon Jul 29 22:00:26 2002
+X-Envelope-Sender: [email protected]
+
+What day of the month is it?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M285218P3770Q19.Trurl b/testsuite/maildir/teaparty/new/1284627340.M285218P3770Q19.Trurl
new file mode 100644
index 0000000..fdd1120
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M285218P3770Q19.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3320
+	for [email protected]; Mon, 29 Jul 2002 22:00:25 +0100
+Date: Mon, 29 Jul 2002 22:00:20 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:27 2002
+X-Envelope-Sender: [email protected]
+
+The fourth.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M286330P3770Q20.Trurl b/testsuite/maildir/teaparty/new/1284627340.M286330P3770Q20.Trurl
new file mode 100644
index 0000000..72710e2
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M286330P3770Q20.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3321
+	for [email protected]; Mon, 29 Jul 2002 22:00:26 +0100
+Date: Mon, 29 Jul 2002 22:00:21 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:28 2002
+X-Envelope-Sender: [email protected]
+
+Two days wrong! I told you butter wouldn't suit the works!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M287547P3770Q21.Trurl b/testsuite/maildir/teaparty/new/1284627340.M287547P3770Q21.Trurl
new file mode 100644
index 0000000..bee8e16
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M287547P3770Q21.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3322
+	for [email protected]; Mon, 29 Jul 2002 22:00:27 +0100
+Date: Mon, 29 Jul 2002 22:00:22 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:29 2002
+X-Envelope-Sender: [email protected]
+
+It was the BEST butter
diff --git a/testsuite/maildir/teaparty/new/1284627340.M288664P3770Q22.Trurl b/testsuite/maildir/teaparty/new/1284627340.M288664P3770Q22.Trurl
new file mode 100644
index 0000000..972ad7f
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M288664P3770Q22.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3323
+	for [email protected]; Mon, 29 Jul 2002 22:00:28 +0100
+Date: Mon, 29 Jul 2002 22:00:23 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:30 2002
+X-Envelope-Sender: [email protected]
+
+Yes, but some crumbs must have got in as well,
+you shouldn't have put it in with the bread-knife.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M289797P3770Q23.Trurl b/testsuite/maildir/teaparty/new/1284627340.M289797P3770Q23.Trurl
new file mode 100644
index 0000000..3a57e36
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M289797P3770Q23.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3324
+	for [email protected]; Mon, 29 Jul 2002 22:00:29 +0100
+Date: Mon, 29 Jul 2002 22:00:24 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:31 2002
+X-Envelope-Sender: [email protected]
+
+It was the BEST butter, you know.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M290914P3770Q24.Trurl b/testsuite/maildir/teaparty/new/1284627340.M290914P3770Q24.Trurl
new file mode 100644
index 0000000..c9e3215
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M290914P3770Q24.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3325
+	for [email protected]; Mon, 29 Jul 2002 22:00:30 +0100
+Date: Mon, 29 Jul 2002 22:00:25 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Funny watch (was Re: Watch)
+X-Envelope-Date: Mon Jul 29 22:00:32 2002
+X-Envelope-Sender: [email protected]
+
+What a funny watch! It tells the day of the
+month, and doesn't tell what o'clock it is!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M292026P3770Q25.Trurl b/testsuite/maildir/teaparty/new/1284627340.M292026P3770Q25.Trurl
new file mode 100644
index 0000000..63d0e8a
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M292026P3770Q25.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3326
+	for [email protected]; Mon, 29 Jul 2002 22:00:31 +0100
+Date: Mon, 29 Jul 2002 22:00:26 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:33 2002
+X-Envelope-Sender: [email protected]
+
+Why should it? Does YOUR watch tell you what year it is?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M293124P3770Q26.Trurl b/testsuite/maildir/teaparty/new/1284627340.M293124P3770Q26.Trurl
new file mode 100644
index 0000000..2a6027f
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M293124P3770Q26.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3327
+	for [email protected]; Mon, 29 Jul 2002 22:00:32 +0100
+Date: Mon, 29 Jul 2002 22:00:27 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:34 2002
+X-Envelope-Sender: [email protected]
+
+Of course not, but that's because it stays the same year for such
+a long time together.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M294284P3770Q27.Trurl b/testsuite/maildir/teaparty/new/1284627340.M294284P3770Q27.Trurl
new file mode 100644
index 0000000..4cdcce3
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M294284P3770Q27.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3328
+	for [email protected]; Mon, 29 Jul 2002 22:00:33 +0100
+Date: Mon, 29 Jul 2002 22:00:28 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:35 2002
+X-Envelope-Sender: [email protected]
+
+Which is just the case with MINE
diff --git a/testsuite/maildir/teaparty/new/1284627340.M295461P3770Q28.Trurl b/testsuite/maildir/teaparty/new/1284627340.M295461P3770Q28.Trurl
new file mode 100644
index 0000000..f6b7f24
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M295461P3770Q28.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3329
+	for [email protected]; Mon, 29 Jul 2002 22:00:34 +0100
+Date: Mon, 29 Jul 2002 22:00:29 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:36 2002
+X-Envelope-Sender: [email protected]
+
+I don't quite understand you
diff --git a/testsuite/maildir/teaparty/new/1284627340.M296638P3770Q29.Trurl b/testsuite/maildir/teaparty/new/1284627340.M296638P3770Q29.Trurl
new file mode 100644
index 0000000..9708129
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M296638P3770Q29.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3330
+	for [email protected]; Mon, 29 Jul 2002 22:00:35 +0100
+Date: Mon, 29 Jul 2002 22:00:30 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Remark
+X-Envelope-Date: Mon Jul 29 22:00:37 2002
+X-Envelope-Sender: [email protected]
+
+The Dormouse is asleep again
diff --git a/testsuite/maildir/teaparty/new/1284627340.M297797P3770Q30.Trurl b/testsuite/maildir/teaparty/new/1284627340.M297797P3770Q30.Trurl
new file mode 100644
index 0000000..c86c2d9
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M297797P3770Q30.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3331
+	for [email protected]; Mon, 29 Jul 2002 22:00:36 +0100
+Date: Mon, 29 Jul 2002 22:00:31 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Nobody at all  <[email protected]>
+Subject: Re: Remark
+X-Envelope-Date: Mon Jul 29 22:00:38 2002
+X-Envelope-Sender: [email protected]
+
+Of course, of course; just what I was going to
+remark myself.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M298892P3770Q31.Trurl b/testsuite/maildir/teaparty/new/1284627340.M298892P3770Q31.Trurl
new file mode 100644
index 0000000..d7b3314
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M298892P3770Q31.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3332
+	for [email protected]; Mon, 29 Jul 2002 22:00:37 +0100
+Date: Mon, 29 Jul 2002 22:00:32 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:39 2002
+X-Envelope-Sender: [email protected]
+
+Have you guessed the riddle yet?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M299968P3770Q32.Trurl b/testsuite/maildir/teaparty/new/1284627340.M299968P3770Q32.Trurl
new file mode 100644
index 0000000..34b5d92
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M299968P3770Q32.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3333
+	for [email protected]; Mon, 29 Jul 2002 22:00:38 +0100
+Date: Mon, 29 Jul 2002 22:00:33 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:40 2002
+X-Envelope-Sender: [email protected]
+
+No, I give it up, what's the answer?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M301074P3770Q33.Trurl b/testsuite/maildir/teaparty/new/1284627340.M301074P3770Q33.Trurl
new file mode 100644
index 0000000..e2e976d
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M301074P3770Q33.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3334
+	for [email protected]; Mon, 29 Jul 2002 22:00:39 +0100
+Date: Mon, 29 Jul 2002 22:00:34 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:41 2002
+X-Envelope-Sender: [email protected]
+
+I haven't the slightest idea
diff --git a/testsuite/maildir/teaparty/new/1284627340.M302186P3770Q34.Trurl b/testsuite/maildir/teaparty/new/1284627340.M302186P3770Q34.Trurl
new file mode 100644
index 0000000..e4a67de
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M302186P3770Q34.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3335
+	for [email protected]; Mon, 29 Jul 2002 22:00:40 +0100
+Date: Mon, 29 Jul 2002 22:00:35 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:42 2002
+X-Envelope-Sender: [email protected]
+
+Nor I
diff --git a/testsuite/maildir/teaparty/new/1284627340.M303260P3770Q35.Trurl b/testsuite/maildir/teaparty/new/1284627340.M303260P3770Q35.Trurl
new file mode 100644
index 0000000..fe6ec9b
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M303260P3770Q35.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3336
+	for [email protected]; Mon, 29 Jul 2002 22:00:41 +0100
+Date: Mon, 29 Jul 2002 22:00:36 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:43 2002
+X-Envelope-Sender: [email protected]
+
+I think you might do something better with the time, than waste it in
+asking riddles that have no answers.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M304334P3770Q36.Trurl b/testsuite/maildir/teaparty/new/1284627340.M304334P3770Q36.Trurl
new file mode 100644
index 0000000..f5066c1
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M304334P3770Q36.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3337
+	for [email protected]; Mon, 29 Jul 2002 22:00:42 +0100
+Date: Mon, 29 Jul 2002 22:00:37 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:44 2002
+X-Envelope-Sender: [email protected]
+
+If you knew Time as well as I do, you
+wouldn't talk about wasting IT.  It's HIM.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M305616P3770Q37.Trurl b/testsuite/maildir/teaparty/new/1284627340.M305616P3770Q37.Trurl
new file mode 100644
index 0000000..60463cc
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M305616P3770Q37.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3338
+	for [email protected]; Mon, 29 Jul 2002 22:00:43 +0100
+Date: Mon, 29 Jul 2002 22:00:38 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:45 2002
+X-Envelope-Sender: [email protected]
+
+I don't know what you mean
diff --git a/testsuite/maildir/teaparty/new/1284627340.M306685P3770Q38.Trurl b/testsuite/maildir/teaparty/new/1284627340.M306685P3770Q38.Trurl
new file mode 100644
index 0000000..8e9741b
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M306685P3770Q38.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3339
+	for [email protected]; Mon, 29 Jul 2002 22:00:44 +0100
+Date: Mon, 29 Jul 2002 22:00:39 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:46 2002
+X-Envelope-Sender: [email protected]
+
+Of course you don't! I dare say you never even spoke to Time!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M307730P3770Q39.Trurl b/testsuite/maildir/teaparty/new/1284627340.M307730P3770Q39.Trurl
new file mode 100644
index 0000000..08aeb81
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M307730P3770Q39.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3340
+	for [email protected]; Mon, 29 Jul 2002 22:00:45 +0100
+Date: Mon, 29 Jul 2002 22:00:40 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:47 2002
+X-Envelope-Sender: [email protected]
+
+Perhaps not, but I know I have to beat time when I learn music.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M308757P3770Q40.Trurl b/testsuite/maildir/teaparty/new/1284627340.M308757P3770Q40.Trurl
new file mode 100644
index 0000000..e3e0b1b
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M308757P3770Q40.Trurl
@@ -0,0 +1,17 @@
+Received: (from [email protected]) 
+	by wonder.land id 3341
+	for [email protected]; Mon, 29 Jul 2002 22:00:46 +0100
+Date: Mon, 29 Jul 2002 22:00:41 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:48 2002
+X-Envelope-Sender: [email protected]
+
+Ah! that accounts for it. He won't stand
+beating.  Now, if you only kept on good terms with him, he'd do
+almost anything you liked with the clock.  For instance, suppose
+it were nine o'clock in the morning, just time to begin lessons:
+you'd only have to whisper a hint to Time, and round goes the
+clock in a twinkling!  Half-past one, time for dinner!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M309833P3770Q41.Trurl b/testsuite/maildir/teaparty/new/1284627340.M309833P3770Q41.Trurl
new file mode 100644
index 0000000..caeb7aa
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M309833P3770Q41.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3342
+	for [email protected]; Mon, 29 Jul 2002 22:00:47 +0100
+Date: Mon, 29 Jul 2002 22:00:42 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Thought apart Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:49 2002
+X-Envelope-Sender: [email protected]
+
+I only wish it was
diff --git a/testsuite/maildir/teaparty/new/1284627340.M310887P3770Q42.Trurl b/testsuite/maildir/teaparty/new/1284627340.M310887P3770Q42.Trurl
new file mode 100644
index 0000000..b934283
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M310887P3770Q42.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3343
+	for [email protected]; Mon, 29 Jul 2002 22:00:48 +0100
+Date: Mon, 29 Jul 2002 22:00:43 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:50 2002
+X-Envelope-Sender: [email protected]
+
+That would be grand, certainly, but then--I shouldn't be hungry for it,
+you know.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M311940P3770Q43.Trurl b/testsuite/maildir/teaparty/new/1284627340.M311940P3770Q43.Trurl
new file mode 100644
index 0000000..6b4260e
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M311940P3770Q43.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3344
+	for [email protected]; Mon, 29 Jul 2002 22:00:49 +0100
+Date: Mon, 29 Jul 2002 22:00:44 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:51 2002
+X-Envelope-Sender: [email protected]
+
+Not at first, perhaps, but you could keep
+it to half-past one as long as you liked.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M313089P3770Q44.Trurl b/testsuite/maildir/teaparty/new/1284627340.M313089P3770Q44.Trurl
new file mode 100644
index 0000000..96552b3
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M313089P3770Q44.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3345
+	for [email protected]; Mon, 29 Jul 2002 22:00:50 +0100
+Date: Mon, 29 Jul 2002 22:00:45 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:52 2002
+X-Envelope-Sender: [email protected]
+
+Is that the way YOU manage?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M314179P3770Q45.Trurl b/testsuite/maildir/teaparty/new/1284627340.M314179P3770Q45.Trurl
new file mode 100644
index 0000000..923cd49
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M314179P3770Q45.Trurl
@@ -0,0 +1,19 @@
+Received: (from [email protected]) 
+	by wonder.land id 3346
+	for [email protected]; Mon, 29 Jul 2002 22:00:51 +0100
+Date: Mon, 29 Jul 2002 22:00:46 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:53 2002
+X-Envelope-Sender: [email protected]
+
+Not I! We quarrelled last March--just before HE went mad, you know--
+it was at the great concert given by the Queen of Hearts, and I had
+to sing
+
+"Twinkle, twinkle, little bat!
+How I wonder what you're at!"
+
+You know the song, perhaps?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M315199P3770Q46.Trurl b/testsuite/maildir/teaparty/new/1284627340.M315199P3770Q46.Trurl
new file mode 100644
index 0000000..bcde04b
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M315199P3770Q46.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3347
+	for [email protected]; Mon, 29 Jul 2002 22:00:52 +0100
+Date: Mon, 29 Jul 2002 22:00:47 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:54 2002
+X-Envelope-Sender: [email protected]
+
+I've heard something like it
diff --git a/testsuite/maildir/teaparty/new/1284627340.M316269P3770Q47.Trurl b/testsuite/maildir/teaparty/new/1284627340.M316269P3770Q47.Trurl
new file mode 100644
index 0000000..6053fa9
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M316269P3770Q47.Trurl
@@ -0,0 +1,16 @@
+Received: (from [email protected]) 
+	by wonder.land id 3348
+	for [email protected]; Mon, 29 Jul 2002 22:00:53 +0100
+Date: Mon, 29 Jul 2002 22:00:48 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:55 2002
+X-Envelope-Sender: [email protected]
+
+It goes on, you know in this way:--
+
+"Up above the world you fly,
+Like a tea-tray in the sky.
+Twinkle, twinkle--"'
diff --git a/testsuite/maildir/teaparty/new/1284627340.M317297P3770Q48.Trurl b/testsuite/maildir/teaparty/new/1284627340.M317297P3770Q48.Trurl
new file mode 100644
index 0000000..b09e586
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M317297P3770Q48.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3349
+	for [email protected]; Mon, 29 Jul 2002 22:00:54 +0100
+Date: Mon, 29 Jul 2002 22:00:49 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Nobody at all  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:56 2002
+X-Envelope-Sender: [email protected]
+
+Twinkle, twinkle, twinkle, twinkle...
diff --git a/testsuite/maildir/teaparty/new/1284627340.M319568P3770Q49.Trurl b/testsuite/maildir/teaparty/new/1284627340.M319568P3770Q49.Trurl
new file mode 100644
index 0000000..abbcb11
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M319568P3770Q49.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3350
+	for [email protected]; Mon, 29 Jul 2002 22:00:55 +0100
+Date: Mon, 29 Jul 2002 22:00:50 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:57 2002
+X-Envelope-Sender: [email protected]
+
+Well, I'd hardly finished the first verse, when the Queen jumped up
+and bawled out, "He's murdering the time!  Off with his head!"
diff --git a/testsuite/maildir/teaparty/new/1284627340.M320950P3770Q50.Trurl b/testsuite/maildir/teaparty/new/1284627340.M320950P3770Q50.Trurl
new file mode 100644
index 0000000..2548447
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M320950P3770Q50.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3351
+	for [email protected]; Mon, 29 Jul 2002 22:00:56 +0100
+Date: Mon, 29 Jul 2002 22:00:51 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:58 2002
+X-Envelope-Sender: [email protected]
+
+How dreadfully savage!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M323043P3770Q51.Trurl b/testsuite/maildir/teaparty/new/1284627340.M323043P3770Q51.Trurl
new file mode 100644
index 0000000..de0be44
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M323043P3770Q51.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3352
+	for [email protected]; Mon, 29 Jul 2002 22:00:57 +0100
+Date: Mon, 29 Jul 2002 22:00:52 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:59 2002
+X-Envelope-Sender: [email protected]
+
+And ever since that, he won't do a thing I ask!  It's always six o'clock now.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M324448P3770Q52.Trurl b/testsuite/maildir/teaparty/new/1284627340.M324448P3770Q52.Trurl
new file mode 100644
index 0000000..540e432
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M324448P3770Q52.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3353
+	for [email protected]; Mon, 29 Jul 2002 22:00:58 +0100
+Date: Mon, 29 Jul 2002 22:00:53 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: A guess (was Re: Discussing Time)
+X-Envelope-Date: Mon Jul 29 22:01:00 2002
+X-Envelope-Sender: [email protected]
+
+Is that the reason so
+many tea-things are put out here?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M325869P3770Q53.Trurl b/testsuite/maildir/teaparty/new/1284627340.M325869P3770Q53.Trurl
new file mode 100644
index 0000000..474b696
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M325869P3770Q53.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3354
+	for [email protected]; Mon, 29 Jul 2002 22:00:59 +0100
+Date: Mon, 29 Jul 2002 22:00:54 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:01 2002
+X-Envelope-Sender: [email protected]
+
+Yes, that's it. It's always
+tea-time, and we've no time to wash the things between whiles.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M327194P3770Q54.Trurl b/testsuite/maildir/teaparty/new/1284627340.M327194P3770Q54.Trurl
new file mode 100644
index 0000000..4eae0d8
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M327194P3770Q54.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3355
+	for [email protected]; Mon, 29 Jul 2002 22:01:00 +0100
+Date: Mon, 29 Jul 2002 22:00:55 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:02 2002
+X-Envelope-Sender: [email protected]
+
+Then you keep moving round, I suppose?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M328537P3770Q55.Trurl b/testsuite/maildir/teaparty/new/1284627340.M328537P3770Q55.Trurl
new file mode 100644
index 0000000..7f42cb2
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M328537P3770Q55.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3356
+	for [email protected]; Mon, 29 Jul 2002 22:01:01 +0100
+Date: Mon, 29 Jul 2002 22:00:56 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:03 2002
+X-Envelope-Sender: [email protected]
+
+Exactly so, as the things get used up.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M329914P3770Q56.Trurl b/testsuite/maildir/teaparty/new/1284627340.M329914P3770Q56.Trurl
new file mode 100644
index 0000000..d4641f5
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M329914P3770Q56.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3357
+	for [email protected]; Mon, 29 Jul 2002 22:01:02 +0100
+Date: Mon, 29 Jul 2002 22:00:57 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:04 2002
+X-Envelope-Sender: [email protected]
+
+But what happens when you come to the beginning again?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M331289P3770Q57.Trurl b/testsuite/maildir/teaparty/new/1284627340.M331289P3770Q57.Trurl
new file mode 100644
index 0000000..5eef9fe
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M331289P3770Q57.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3358
+	for [email protected]; Mon, 29 Jul 2002 22:01:03 +0100
+Date: Mon, 29 Jul 2002 22:00:58 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Request for a story (was Re: A guess)
+X-Envelope-Date: Mon Jul 29 22:01:05 2002
+X-Envelope-Sender: [email protected]
+
+Suppose we change the subject, I'm getting tired of this.
+I vote the young lady tells us a story.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M332838P3770Q58.Trurl b/testsuite/maildir/teaparty/new/1284627340.M332838P3770Q58.Trurl
new file mode 100644
index 0000000..a2c8633
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M332838P3770Q58.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3359
+	for [email protected]; Mon, 29 Jul 2002 22:01:04 +0100
+Date: Mon, 29 Jul 2002 22:00:59 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:06 2002
+X-Envelope-Sender: [email protected]
+
+I'm afraid I don't know one
diff --git a/testsuite/maildir/teaparty/new/1284627340.M334208P3770Q59.Trurl b/testsuite/maildir/teaparty/new/1284627340.M334208P3770Q59.Trurl
new file mode 100644
index 0000000..98e8389
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M334208P3770Q59.Trurl
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3360
+	for [email protected]; Mon, 29 Jul 2002 22:01:05 +0100
+Date: Mon, 29 Jul 2002 22:01:00 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Cc: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:07 2002
+X-Envelope-Sender: [email protected]
+
+Then the Dormouse shall!
+Wake up, Dormouse!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M335618P3770Q60.Trurl b/testsuite/maildir/teaparty/new/1284627340.M335618P3770Q60.Trurl
new file mode 100644
index 0000000..0e61312
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M335618P3770Q60.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3361
+	for [email protected]; Mon, 29 Jul 2002 22:01:06 +0100
+Date: Mon, 29 Jul 2002 22:01:01 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:08 2002
+X-Envelope-Sender: [email protected]
+
+I wasn't asleep. I heard every word you fellows
+were saying.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M336975P3770Q61.Trurl b/testsuite/maildir/teaparty/new/1284627340.M336975P3770Q61.Trurl
new file mode 100644
index 0000000..8521852
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M336975P3770Q61.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3362
+	for [email protected]; Mon, 29 Jul 2002 22:01:07 +0100
+Date: Mon, 29 Jul 2002 22:01:02 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:09 2002
+X-Envelope-Sender: [email protected]
+
+Tell us a story!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M338373P3770Q62.Trurl b/testsuite/maildir/teaparty/new/1284627340.M338373P3770Q62.Trurl
new file mode 100644
index 0000000..82bd28e
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M338373P3770Q62.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3363
+	for [email protected]; Mon, 29 Jul 2002 22:01:08 +0100
+Date: Mon, 29 Jul 2002 22:01:03 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:10 2002
+X-Envelope-Sender: [email protected]
+
+Yes, please do!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M339710P3770Q63.Trurl b/testsuite/maildir/teaparty/new/1284627340.M339710P3770Q63.Trurl
new file mode 100644
index 0000000..363b505
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M339710P3770Q63.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3364
+	for [email protected]; Mon, 29 Jul 2002 22:01:09 +0100
+Date: Mon, 29 Jul 2002 22:01:04 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:11 2002
+X-Envelope-Sender: [email protected]
+
+And be quick about it, or you'll be asleep
+again before it's done.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M341068P3770Q64.Trurl b/testsuite/maildir/teaparty/new/1284627340.M341068P3770Q64.Trurl
new file mode 100644
index 0000000..97578c1
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M341068P3770Q64.Trurl
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3365
+	for [email protected]; Mon, 29 Jul 2002 22:01:10 +0100
+Date: Mon, 29 Jul 2002 22:01:05 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Story (was Re: Request for a story)
+X-Envelope-Date: Mon Jul 29 22:01:12 2002
+X-Envelope-Sender: [email protected]
+
+Once upon a time there were three little sisters, and their names
+were Elsie,
+Lacie, and Tillie; and they lived at the bottom of a well--
diff --git a/testsuite/maildir/teaparty/new/1284627340.M342568P3770Q65.Trurl b/testsuite/maildir/teaparty/new/1284627340.M342568P3770Q65.Trurl
new file mode 100644
index 0000000..8d0e2b8
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M342568P3770Q65.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3366
+	for [email protected]; Mon, 29 Jul 2002 22:01:11 +0100
+Date: Mon, 29 Jul 2002 22:01:06 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:13 2002
+X-Envelope-Sender: [email protected]
+
+What did they live on?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M344110P3770Q66.Trurl b/testsuite/maildir/teaparty/new/1284627340.M344110P3770Q66.Trurl
new file mode 100644
index 0000000..6144ca5
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M344110P3770Q66.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3367
+	for [email protected]; Mon, 29 Jul 2002 22:01:12 +0100
+Date: Mon, 29 Jul 2002 22:01:07 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:14 2002
+X-Envelope-Sender: [email protected]
+
+They lived on treacle
diff --git a/testsuite/maildir/teaparty/new/1284627340.M345494P3770Q67.Trurl b/testsuite/maildir/teaparty/new/1284627340.M345494P3770Q67.Trurl
new file mode 100644
index 0000000..65d543d
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M345494P3770Q67.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3368
+	for [email protected]; Mon, 29 Jul 2002 22:01:13 +0100
+Date: Mon, 29 Jul 2002 22:01:08 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:15 2002
+X-Envelope-Sender: [email protected]
+
+They couldn't have done that, you know, they'd have been ill
diff --git a/testsuite/maildir/teaparty/new/1284627340.M346885P3770Q68.Trurl b/testsuite/maildir/teaparty/new/1284627340.M346885P3770Q68.Trurl
new file mode 100644
index 0000000..d519e9a
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M346885P3770Q68.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3369
+	for [email protected]; Mon, 29 Jul 2002 22:01:14 +0100
+Date: Mon, 29 Jul 2002 22:01:09 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:16 2002
+X-Envelope-Sender: [email protected]
+
+So they were, VERY ill.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M348223P3770Q69.Trurl b/testsuite/maildir/teaparty/new/1284627340.M348223P3770Q69.Trurl
new file mode 100644
index 0000000..a593cce
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M348223P3770Q69.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3370
+	for [email protected]; Mon, 29 Jul 2002 22:01:15 +0100
+Date: Mon, 29 Jul 2002 22:01:10 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:17 2002
+X-Envelope-Sender: [email protected]
+
+But why did they live at the bottom of a well?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M349604P3770Q70.Trurl b/testsuite/maildir/teaparty/new/1284627340.M349604P3770Q70.Trurl
new file mode 100644
index 0000000..e29ab6d
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M349604P3770Q70.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3371
+	for [email protected]; Mon, 29 Jul 2002 22:01:16 +0100
+Date: Mon, 29 Jul 2002 22:01:11 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Remark
+X-Envelope-Date: Mon Jul 29 22:01:18 2002
+X-Envelope-Sender: [email protected]
+
+Take some more tea
diff --git a/testsuite/maildir/teaparty/new/1284627340.M350959P3770Q71.Trurl b/testsuite/maildir/teaparty/new/1284627340.M350959P3770Q71.Trurl
new file mode 100644
index 0000000..31befeb
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M350959P3770Q71.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3372
+	for [email protected]; Mon, 29 Jul 2002 22:01:17 +0100
+Date: Mon, 29 Jul 2002 22:01:12 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Remark
+X-Envelope-Date: Mon Jul 29 22:01:19 2002
+X-Envelope-Sender: [email protected]
+
+I've had nothing yet, so
+I can't take more.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M352279P3770Q72.Trurl b/testsuite/maildir/teaparty/new/1284627340.M352279P3770Q72.Trurl
new file mode 100644
index 0000000..7f2dacb
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M352279P3770Q72.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3373
+	for [email protected]; Mon, 29 Jul 2002 22:01:18 +0100
+Date: Mon, 29 Jul 2002 22:01:13 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Remark
+X-Envelope-Date: Mon Jul 29 22:01:20 2002
+X-Envelope-Sender: [email protected]
+
+You mean you can't take LESS, it's very
+easy to take MORE than nothing.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M353687P3770Q73.Trurl b/testsuite/maildir/teaparty/new/1284627340.M353687P3770Q73.Trurl
new file mode 100644
index 0000000..66eefe7
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M353687P3770Q73.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3374
+	for [email protected]; Mon, 29 Jul 2002 22:01:19 +0100
+Date: Mon, 29 Jul 2002 22:01:14 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Personal remark
+X-Envelope-Date: Mon Jul 29 22:01:21 2002
+X-Envelope-Sender: [email protected]
+
+Nobody asked YOUR opinion
diff --git a/testsuite/maildir/teaparty/new/1284627340.M355220P3770Q74.Trurl b/testsuite/maildir/teaparty/new/1284627340.M355220P3770Q74.Trurl
new file mode 100644
index 0000000..b2c91fe
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M355220P3770Q74.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3375
+	for [email protected]; Mon, 29 Jul 2002 22:01:20 +0100
+Date: Mon, 29 Jul 2002 22:01:15 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Personal remark
+X-Envelope-Date: Mon Jul 29 22:01:22 2002
+X-Envelope-Sender: [email protected]
+
+Who's making personal remarks now?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M356601P3770Q75.Trurl b/testsuite/maildir/teaparty/new/1284627340.M356601P3770Q75.Trurl
new file mode 100644
index 0000000..df08e45
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M356601P3770Q75.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3376
+	for [email protected]; Mon, 29 Jul 2002 22:01:21 +0100
+Date: Mon, 29 Jul 2002 22:01:16 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:23 2002
+X-Envelope-Sender: [email protected]
+
+Why did they live at the
+bottom of a well?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M358019P3770Q76.Trurl b/testsuite/maildir/teaparty/new/1284627340.M358019P3770Q76.Trurl
new file mode 100644
index 0000000..0876b64
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M358019P3770Q76.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3377
+	for [email protected]; Mon, 29 Jul 2002 22:01:22 +0100
+Date: Mon, 29 Jul 2002 22:01:17 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:24 2002
+X-Envelope-Sender: [email protected]
+
+It was a treacle-well.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M359379P3770Q77.Trurl b/testsuite/maildir/teaparty/new/1284627340.M359379P3770Q77.Trurl
new file mode 100644
index 0000000..a139ad0
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M359379P3770Q77.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3378
+	for [email protected]; Mon, 29 Jul 2002 22:01:23 +0100
+Date: Mon, 29 Jul 2002 22:01:18 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:25 2002
+X-Envelope-Sender: [email protected]
+
+There's no such thing!
diff --git a/testsuite/maildir/teaparty/new/1284627340.M360741P3770Q78.Trurl b/testsuite/maildir/teaparty/new/1284627340.M360741P3770Q78.Trurl
new file mode 100644
index 0000000..cb9dd8a
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M360741P3770Q78.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3379
+	for [email protected]; Mon, 29 Jul 2002 22:01:24 +0100
+Date: Mon, 29 Jul 2002 22:01:19 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:26 2002
+X-Envelope-Sender: [email protected]
+
+If you can't be civil, you'd better finish the
+story for yourself.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M362164P3770Q79.Trurl b/testsuite/maildir/teaparty/new/1284627340.M362164P3770Q79.Trurl
new file mode 100644
index 0000000..0b6ffdc
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M362164P3770Q79.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3380
+	for [email protected]; Mon, 29 Jul 2002 22:01:25 +0100
+Date: Mon, 29 Jul 2002 22:01:20 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:27 2002
+X-Envelope-Sender: [email protected]
+
+No, please go on! I won't interrupt
+again.  I dare say there may be ONE.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M363564P3770Q80.Trurl b/testsuite/maildir/teaparty/new/1284627340.M363564P3770Q80.Trurl
new file mode 100644
index 0000000..6b4f8ab
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M363564P3770Q80.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3381
+	for [email protected]; Mon, 29 Jul 2002 22:01:26 +0100
+Date: Mon, 29 Jul 2002 22:01:21 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:28 2002
+X-Envelope-Sender: [email protected]
+
+One, indeed! And so these three little sisters--they
+were learning to draw, you know--
diff --git a/testsuite/maildir/teaparty/new/1284627340.M364969P3770Q81.Trurl b/testsuite/maildir/teaparty/new/1284627340.M364969P3770Q81.Trurl
new file mode 100644
index 0000000..0b89032
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M364969P3770Q81.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3382
+	for [email protected]; Mon, 29 Jul 2002 22:01:27 +0100
+Date: Mon, 29 Jul 2002 22:01:22 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:29 2002
+X-Envelope-Sender: [email protected]
+
+What did they draw?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M366552P3770Q82.Trurl b/testsuite/maildir/teaparty/new/1284627340.M366552P3770Q82.Trurl
new file mode 100644
index 0000000..e9a25bc
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M366552P3770Q82.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3383
+	for [email protected]; Mon, 29 Jul 2002 22:01:28 +0100
+Date: Mon, 29 Jul 2002 22:01:23 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:30 2002
+X-Envelope-Sender: [email protected]
+
+Treacle.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M367871P3770Q83.Trurl b/testsuite/maildir/teaparty/new/1284627340.M367871P3770Q83.Trurl
new file mode 100644
index 0000000..b0777ca
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M367871P3770Q83.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3384
+	for [email protected]; Mon, 29 Jul 2002 22:01:29 +0100
+Date: Mon, 29 Jul 2002 22:01:24 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Let's move
+X-Envelope-Date: Mon Jul 29 22:01:31 2002
+X-Envelope-Sender: [email protected]
+
+I want a clean cup, let's all move
+one place on.
diff --git a/testsuite/maildir/teaparty/new/1284627340.M369631P3770Q84.Trurl b/testsuite/maildir/teaparty/new/1284627340.M369631P3770Q84.Trurl
new file mode 100644
index 0000000..fec270e
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M369631P3770Q84.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3385
+	for [email protected]; Mon, 29 Jul 2002 22:01:30 +0100
+Date: Mon, 29 Jul 2002 22:01:25 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:32 2002
+X-Envelope-Sender: [email protected]
+
+But I don't understand.  Where did they draw
+the treacle from?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M371207P3770Q85.Trurl b/testsuite/maildir/teaparty/new/1284627340.M371207P3770Q85.Trurl
new file mode 100644
index 0000000..0d2dcc2
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M371207P3770Q85.Trurl
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3386
+	for [email protected]; Mon, 29 Jul 2002 22:01:31 +0100
+Date: Mon, 29 Jul 2002 22:01:26 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:33 2002
+X-Envelope-Sender: [email protected]
+
+You can draw water out of a water-well, so
+I should think you could draw treacle out of a treacle-well--eh,
+stupid?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M372773P3770Q86.Trurl b/testsuite/maildir/teaparty/new/1284627340.M372773P3770Q86.Trurl
new file mode 100644
index 0000000..84d89e1
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M372773P3770Q86.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3387
+	for [email protected]; Mon, 29 Jul 2002 22:01:32 +0100
+Date: Mon, 29 Jul 2002 22:01:27 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:34 2002
+X-Envelope-Sender: [email protected]
+
+But they were IN the well
diff --git a/testsuite/maildir/teaparty/new/1284627340.M374547P3770Q87.Trurl b/testsuite/maildir/teaparty/new/1284627340.M374547P3770Q87.Trurl
new file mode 100644
index 0000000..2c1e82b
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M374547P3770Q87.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3388
+	for [email protected]; Mon, 29 Jul 2002 22:01:33 +0100
+Date: Mon, 29 Jul 2002 22:01:28 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:35 2002
+X-Envelope-Sender: [email protected]
+
+Of course they were -- well in
diff --git a/testsuite/maildir/teaparty/new/1284627340.M376748P3770Q88.Trurl b/testsuite/maildir/teaparty/new/1284627340.M376748P3770Q88.Trurl
new file mode 100644
index 0000000..eb40349
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M376748P3770Q88.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3389
+	for [email protected]; Mon, 29 Jul 2002 22:01:34 +0100
+Date: Mon, 29 Jul 2002 22:01:29 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:36 2002
+X-Envelope-Sender: [email protected]
+
+They were learning to draw, and they drew
+all manner of things--everything that begins with an M--
diff --git a/testsuite/maildir/teaparty/new/1284627340.M378593P3770Q89.Trurl b/testsuite/maildir/teaparty/new/1284627340.M378593P3770Q89.Trurl
new file mode 100644
index 0000000..b3bcd05
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M378593P3770Q89.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3390
+	for [email protected]; Mon, 29 Jul 2002 22:01:35 +0100
+Date: Mon, 29 Jul 2002 22:01:30 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:37 2002
+X-Envelope-Sender: [email protected]
+
+Why with an M?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M380152P3770Q90.Trurl b/testsuite/maildir/teaparty/new/1284627340.M380152P3770Q90.Trurl
new file mode 100644
index 0000000..0a67711
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M380152P3770Q90.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3391
+	for [email protected]; Mon, 29 Jul 2002 22:01:36 +0100
+Date: Mon, 29 Jul 2002 22:01:31 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:38 2002
+X-Envelope-Sender: [email protected]
+
+Why not?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M381696P3770Q91.Trurl b/testsuite/maildir/teaparty/new/1284627340.M381696P3770Q91.Trurl
new file mode 100644
index 0000000..b3ab656
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M381696P3770Q91.Trurl
@@ -0,0 +1,15 @@
+Received: (from [email protected]) 
+	by wonder.land id 3392
+	for [email protected]; Mon, 29 Jul 2002 22:01:37 +0100
+Date: Mon, 29 Jul 2002 22:01:32 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:39 2002
+X-Envelope-Sender: [email protected]
+
+--that begins with an
+M, such as mouse-traps, and the moon, and memory, and muchness--
+you know you say things are "much of a muchness" --did you ever
+see such a thing as a drawing of a muchness?
diff --git a/testsuite/maildir/teaparty/new/1284627340.M383396P3770Q92.Trurl b/testsuite/maildir/teaparty/new/1284627340.M383396P3770Q92.Trurl
new file mode 100644
index 0000000..cc63dad
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M383396P3770Q92.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3393
+	for [email protected]; Mon, 29 Jul 2002 22:01:38 +0100
+Date: Mon, 29 Jul 2002 22:01:33 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:40 2002
+X-Envelope-Sender: [email protected]
+
+Really, now you ask me, I don't think--
diff --git a/testsuite/maildir/teaparty/new/1284627340.M385021P3770Q93.Trurl b/testsuite/maildir/teaparty/new/1284627340.M385021P3770Q93.Trurl
new file mode 100644
index 0000000..3bdce57
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M385021P3770Q93.Trurl
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3394
+	for [email protected]; Mon, 29 Jul 2002 22:01:39 +0100
+Date: Mon, 29 Jul 2002 22:01:34 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Rude remark
+X-Envelope-Date: Mon Jul 29 22:01:41 2002
+X-Envelope-Sender: [email protected]
+
+Then you shouldn't talk
diff --git a/testsuite/maildir/teaparty/new/1284627340.M386577P3770Q94.Trurl b/testsuite/maildir/teaparty/new/1284627340.M386577P3770Q94.Trurl
new file mode 100644
index 0000000..20ae888
--- /dev/null
+++ b/testsuite/maildir/teaparty/new/1284627340.M386577P3770Q94.Trurl
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3395
+	for [email protected]; Mon, 29 Jul 2002 22:01:40 +0100
+Date: Mon, 29 Jul 2002 22:01:35 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Thoughts
+X-Envelope-Date: Mon Jul 29 22:01:42 2002
+X-Envelope-Sender: [email protected]
+
+At any rate I'll never go THERE again! It's the stupidest tea-party I
+ever was at in all my life!
diff --git a/testsuite/mbdel.at b/testsuite/mbdel.at
new file mode 100644
index 0000000..8ce8e29
--- /dev/null
+++ b/testsuite/mbdel.at
@@ -0,0 +1,78 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite. 
+
+dnl ------------------------------------------------------------
+dnl MBDEL_TEST([FORMAT], [PROG],
+dnl             [CODE], [STDOUT = `'], [STDERR = `'],
+dnl             [RUN-IF-FAIL], [RUN-IF-PASS])
+m4_define([MBDEL_TEST],[
+AT_SETUP([Mailbox deletion: $1])
+AT_KEYWORDS([mailbox mbdel mbdel-$1])
+AT_CHECK([$2],[$3],[$4],[$5],[$6],[$7],[$8])
+AT_CLEANUP
+])
+
+dnl ------------------------------------------------------------
+MBDEL_TEST([mbox],
+[cp $abs_top_srcdir/testsuite/spool/mbox1 .
+chmod +w mbox1
+mbdel mbox:mbox1 || exit 2
+test -f mbox1
+],
+[1])
+
+MBDEL_TEST([mh],
+[cp -r $abs_top_srcdir/testsuite/mh/mbox1 .
+chmod -R +w mbox1
+mbdel mh:mbox1 || exit 2
+test -d mbox1
+],
+[1])
+
+MBDEL_TEST([maildir],
+[cp -r $abs_top_srcdir/testsuite/maildir/mbox1 .
+chmod -R +w mbox1
+mbdel maildir:mbox1 || exit 2
+test -d mbox1
+],
+[1])
+
+MBDEL_TEST([mh with subdirs],
+[cp -r $abs_top_srcdir/testsuite/mh/mbox1 .
+chmod -R +w mbox1
+mkdir mbox1/subfolder
+mbdel mh:mbox1 || exit 2
+test -d mbox1 && find mbox1
+],
+[0],
+[mailbox removed, but has subfolders
+mbox1
+mbox1/subfolder
+])
+
+MBDEL_TEST([maildir with subdirs],
+[cp -r $abs_top_srcdir/testsuite/maildir/mbox1 .
+chmod -R +w mbox1
+mkdir mbox1/subfolder
+mbdel maildir:mbox1 || exit 2
+test -d mbox1 && find mbox1
+],
+[0],
+[mailbox removed, but has subfolders
+mbox1
+mbox1/subfolder
+])
diff --git a/libmailutils/tests/mbdel.c b/testsuite/mbdel.c
similarity index 100%
rename from libmailutils/tests/mbdel.c
rename to testsuite/mbdel.c
diff --git a/testsuite/mh/mbox1/1 b/testsuite/mh/mbox1/1
new file mode 100644
index 0000000..421117e
--- /dev/null
+++ b/testsuite/mh/mbox1/1
@@ -0,0 +1,47 @@
+Received: (from [email protected])
+	by nonexistent.net id fBSKI8N04906
+	for [email protected]; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 22:18:08 +0200
+From: Foo Bar <[email protected]>
+Message-Id: <[email protected]>
+To: Bar <[email protected]>
+Subject: Jabberwocky
+X-IMAPbase: 0 1
+X-Envelope-Date: Fri Dec 28 22:18:09 2001
+X-Envelope-Sender: [email protected]
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two!  One, two!  And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day!  Calloh!  Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
diff --git a/testsuite/mh/mbox1/2 b/testsuite/mh/mbox1/2
new file mode 100644
index 0000000..4153198
--- /dev/null
+++ b/testsuite/mh/mbox1/2
@@ -0,0 +1,15 @@
+Received: (from [email protected])
+	by dontmailme.org id fERKR9N16790
+	for [email protected]; Fri, 28 Dec 2001 22:18:08 +0200
+Date: Fri, 28 Dec 2001 23:28:08 +0200
+From: Bar <[email protected]>
+To: Foo Bar <[email protected]>
+Message-Id: <[email protected]>
+Subject: Re: Jabberwocky
+X-Envelope-Date: Fri Dec 28 23:28:09 2001
+X-Envelope-Sender: [email protected]
+
+It seems very pretty, but it's *rather* hard to understand!'
+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...
diff --git a/testsuite/mh/mbox1/3 b/testsuite/mh/mbox1/3
new file mode 100644
index 0000000..2efcb9e
--- /dev/null
+++ b/testsuite/mh/mbox1/3
@@ -0,0 +1,44 @@
+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]>
+To: Foo Bar <[email protected]>
+Subject: Simple MIME
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <[email protected]>
+Date: Sat, 13 Jul 2002 00:43:18 +0300
+From: Sergey Poznyakoff <[email protected]>
+X-Envelope-Date: Sat Jul 13 00:43:18 2002
+X-Envelope-Sender: [email protected]
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="msg.1"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: How doth
+
+How doth the little crocodile
+Improve his shining tail,
+And pour the waters of the Nile
+On every golden scale!
+
+`How cheerfully he seems to grin,
+How neatly spread his claws,
+And welcome little fishes in
+With gently smiling jaws!
+
+------- =_aaaaaaaaaa0
+Content-Type: application/octet-stream; name="msg.21"
+Content-ID: <[email protected]>
+Content-Description: Father William Part I
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCBGYXRoZXIgV2lsbGlhbSwnIHRoZSB5b3VuZyBtYW4gc2FpZCwKYEFuZCB5
+b3VyIGhhaXIgaGFzIGJlY29tZSB2ZXJ5IHdoaXRlOwpBbmQgeWV0IHlvdSBpbmNlc3NhbnRseSBz
+dGFuZCBvbiB5b3VyIGhlYWQtLQpEbyB5b3UgdGhpbmssIGF0IHlvdXIgYWdlLCBpdCBpcyByaWdo
+dD8nCgpgSW4gbXkgeW91dGgsJyBGYXRoZXIgV2lsbGlhbSByZXBsaWVkIHRvIGhpcyBzb24sCmBJ
+IGZlYXJlZCBpdCBtaWdodCBpbmp1cmUgdGhlIGJyYWluOwpCdXQsIG5vdyB0aGF0IEknbSBwZXJm
+ZWN0bHkgc3VyZSBJIGhhdmUgbm9uZSwKV2h5LCBJIGRvIGl0IGFnYWluIGFuZCBhZ2Fpbi4nCgo=
+
+------- =_aaaaaaaaaa0--
diff --git a/testsuite/mh/mbox1/4 b/testsuite/mh/mbox1/4
new file mode 100644
index 0000000..4763565
--- /dev/null
+++ b/testsuite/mh/mbox1/4
@@ -0,0 +1,86 @@
+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]>
+To: Foo Bar <[email protected]>
+Subject: Nested MIME
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <[email protected]>
+Date: Sat, 13 Jul 2002 00:50:58 +0300
+From: Sergey Poznyakoff <[email protected]>
+X-Envelope-Date: Sat Jul 13 00:50:58 2002
+X-Envelope-Sender: [email protected]
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="msg.21"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: Father William Part I
+
+`You are old, Father William,' the young man said,
+`And your hair has become very white;
+And yet you incessantly stand on your head--
+Do you think, at your age, it is right?'
+
+`In my youth,' Father William replied to his son,
+`I feared it might injure the brain;
+But, now that I'm perfectly sure I have none,
+Why, I do it again and again.'
+
+
+------- =_aaaaaaaaaa0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa1"
+Content-ID: <[email protected]>
+
+------- =_aaaaaaaaaa1
+Content-Type: application/octet-stream; name="msg.22"
+Content-ID: <[email protected]>
+Content-Description: Father William Part II
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhcyBJIG1lbnRpb25lZCBiZWZvcmUsCkFu
+ZCBoYXZlIGdyb3duIG1vc3QgdW5jb21tb25seSBmYXQ7CllldCB5b3UgdHVybmVkIGEgYmFjay1z
+b21lcnNhdWx0IGluIGF0IHRoZSBkb29yLS0KUHJheSwgd2hhdCBpcyB0aGUgcmVhc29uIG9mIHRo
+YXQ/JwoKYEluIG15IHlvdXRoLCcgc2FpZCB0aGUgc2FnZSwgYXMgaGUgc2hvb2sgaGlzIGdyZXkg
+bG9ja3MsCmBJIGtlcHQgYWxsIG15IGxpbWJzIHZlcnkgc3VwcGxlCkJ5IHRoZSB1c2Ugb2YgdGhp
+cyBvaW50bWVudC0tb25lIHNoaWxsaW5nIHRoZSBib3gtLQpBbGxvdyBtZSB0byBzZWxsIHlvdSBh
+IGNvdXBsZT8nCg==
+
+------- =_aaaaaaaaaa1
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa2"
+Content-ID: <[email protected]>
+
+------- =_aaaaaaaaaa2
+Content-Type: application/octet-stream; name="msg.23"
+Content-ID: <[email protected]>
+Content-Description: Father William Part III
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBhbmQgeW91ciBqYXdzIGFyZSB0b28gd2Vh
+awpGb3IgYW55dGhpbmcgdG91Z2hlciB0aGFuIHN1ZXQ7CllldCB5b3UgZmluaXNoZWQgdGhlIGdv
+b3NlLCB3aXRoIHRoZSBib25lcyBhbmQgdGhlIGJlYWstLQpQcmF5IGhvdyBkaWQgeW91IG1hbmFn
+ZSB0byBkbyBpdD8nCgpgSW4gbXkgeW91dGgsJyBzYWlkIGhpcyBmYXRoZXIsIGBJIHRvb2sgdG8g
+dGhlIGxhdywKQW5kIGFyZ3VlZCBlYWNoIGNhc2Ugd2l0aCBteSB3aWZlOwpBbmQgdGhlIG11c2N1
+bGFyIHN0cmVuZ3RoLCB3aGljaCBpdCBnYXZlIHRvIG15IGphdywKSGFzIGxhc3RlZCB0aGUgcmVz
+dCBvZiBteSBsaWZlLicK
+
+------- =_aaaaaaaaaa2
+Content-Type: application/octet-stream; name="msg.24"
+Content-ID: <[email protected]>
+Content-Description: Father William Part IV
+Content-Transfer-Encoding: base64
+
+YFlvdSBhcmUgb2xkLCcgc2FpZCB0aGUgeW91dGgsIGBvbmUgd291bGQgaGFyZGx5IHN1cHBvc2UK
+VGhhdCB5b3VyIGV5ZSB3YXMgYXMgc3RlYWR5IGFzIGV2ZXI7CllldCB5b3UgYmFsYW5jZWQgYW4g
+ZWVsIG9uIHRoZSBlbmQgb2YgeW91ciBub3NlLS0KV2hhdCBtYWRlIHlvdSBzbyBhd2Z1bGx5IGNs
+ZXZlcj8nCgpgSSBoYXZlIGFuc3dlcmVkIHRocmVlIHF1ZXN0aW9ucywgYW5kIHRoYXQgaXMgZW5v
+dWdoLCcKU2FpZCBoaXMgZmF0aGVyOyBgZG9uJ3QgZ2l2ZSB5b3Vyc2VsZiBhaXJzIQpEbyB5b3Ug
+dGhpbmsgSSBjYW4gbGlzdGVuIGFsbCBkYXkgdG8gc3VjaCBzdHVmZj8KQmUgb2ZmLCBvciBJJ2xs
+IGtpY2sgeW91IGRvd24gc3RhaXJzIScK
+
+------- =_aaaaaaaaaa2--
+
+------- =_aaaaaaaaaa1--
+
+------- =_aaaaaaaaaa0--
diff --git a/testsuite/mh/mbox1/5 b/testsuite/mh/mbox1/5
new file mode 100644
index 0000000..660803f
--- /dev/null
+++ b/testsuite/mh/mbox1/5
@@ -0,0 +1,29 @@
+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]>
+To: Foo Bar <[email protected]>
+Subject: Empty MIME Parts
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <[email protected]>
+Date: Sat, 13 Jul 2002 00:43:18 +0300
+From: Sergey Poznyakoff <[email protected]>
+X-Envelope-Date: Sat Jul 13 00:43:18 2002
+X-Envelope-Sender: [email protected]
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="empty"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: Empty part
+
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; name="single.line"; charset="us-ascii"
+Content-ID: <[email protected]>
+Content-Description: Single line part
+
+
+
+------- =_aaaaaaaaaa0--
diff --git a/testsuite/mh/teaparty/1 b/testsuite/mh/teaparty/1
new file mode 100644
index 0000000..734ccc9
--- /dev/null
+++ b/testsuite/mh/teaparty/1
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3301
+	for [email protected]; Mon, 29 Jul 2002 22:00:06 +0100
+Date: Mon, 29 Jul 2002 22:00:01 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Invitation
+X-IMAPbase: 0 1
+X-Envelope-Date: Mon Jul 29 22:00:08 2002
+X-Envelope-Sender: [email protected]
+
+Have some wine
diff --git a/testsuite/mh/teaparty/10 b/testsuite/mh/teaparty/10
new file mode 100644
index 0000000..bc92010
--- /dev/null
+++ b/testsuite/mh/teaparty/10
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3310
+	for [email protected]; Mon, 29 Jul 2002 22:00:15 +0100
+Date: Mon, 29 Jul 2002 22:00:10 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:17 2002
+X-Envelope-Sender: [email protected]
+
+I believe I can guess that
diff --git a/testsuite/mh/teaparty/11 b/testsuite/mh/teaparty/11
new file mode 100644
index 0000000..1b44eac
--- /dev/null
+++ b/testsuite/mh/teaparty/11
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3311
+	for [email protected]; Mon, 29 Jul 2002 22:00:16 +0100
+Date: Mon, 29 Jul 2002 22:00:11 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:18 2002
+X-Envelope-Sender: [email protected]
+
+Do you mean that you think you can find out the answer to it?
diff --git a/testsuite/mh/teaparty/12 b/testsuite/mh/teaparty/12
new file mode 100644
index 0000000..8900979
--- /dev/null
+++ b/testsuite/mh/teaparty/12
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3312
+	for [email protected]; Mon, 29 Jul 2002 22:00:17 +0100
+Date: Mon, 29 Jul 2002 22:00:12 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:19 2002
+X-Envelope-Sender: [email protected]
+
+Exactly so
diff --git a/testsuite/mh/teaparty/13 b/testsuite/mh/teaparty/13
new file mode 100644
index 0000000..0e5e574
--- /dev/null
+++ b/testsuite/mh/teaparty/13
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3313
+	for [email protected]; Mon, 29 Jul 2002 22:00:18 +0100
+Date: Mon, 29 Jul 2002 22:00:13 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Be specific (was Re: Riddle)
+X-Envelope-Date: Mon Jul 29 22:00:20 2002
+X-Envelope-Sender: [email protected]
+
+Then you should say what you mean
diff --git a/testsuite/mh/teaparty/14 b/testsuite/mh/teaparty/14
new file mode 100644
index 0000000..1515693
--- /dev/null
+++ b/testsuite/mh/teaparty/14
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3314
+	for [email protected]; Mon, 29 Jul 2002 22:00:19 +0100
+Date: Mon, 29 Jul 2002 22:00:14 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:21 2002
+X-Envelope-Sender: [email protected]
+
+I do, at least--at least I mean what
+I say--that's the same thing, you know.
diff --git a/testsuite/mh/teaparty/15 b/testsuite/mh/teaparty/15
new file mode 100644
index 0000000..1fd85b4
--- /dev/null
+++ b/testsuite/mh/teaparty/15
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3315
+	for [email protected]; Mon, 29 Jul 2002 22:00:20 +0100
+Date: Mon, 29 Jul 2002 22:00:15 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:22 2002
+X-Envelope-Sender: [email protected]
+
+Not the same thing a bit! You might just
+as well say that "I see what I eat" is the same thing as "I eat
+what I see"!
diff --git a/testsuite/mh/teaparty/16 b/testsuite/mh/teaparty/16
new file mode 100644
index 0000000..f8e35ff
--- /dev/null
+++ b/testsuite/mh/teaparty/16
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3316
+	for [email protected]; Mon, 29 Jul 2002 22:00:21 +0100
+Date: Mon, 29 Jul 2002 22:00:16 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:23 2002
+X-Envelope-Sender: [email protected]
+
+You might just as well say, that "I
+like what I get" is the same thing as "I get what I like"!
diff --git a/testsuite/mh/teaparty/17 b/testsuite/mh/teaparty/17
new file mode 100644
index 0000000..068ed33
--- /dev/null
+++ b/testsuite/mh/teaparty/17
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3317
+	for [email protected]; Mon, 29 Jul 2002 22:00:22 +0100
+Date: Mon, 29 Jul 2002 22:00:17 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:24 2002
+X-Envelope-Sender: [email protected]
+
+You might just as well say, who seemed to
+be talking in his sleep, `that "I breathe when I sleep" is the
+same thing as "I sleep when I breathe"!
diff --git a/testsuite/mh/teaparty/18 b/testsuite/mh/teaparty/18
new file mode 100644
index 0000000..49487a7
--- /dev/null
+++ b/testsuite/mh/teaparty/18
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3318
+	for [email protected]; Mon, 29 Jul 2002 22:00:23 +0100
+Date: Mon, 29 Jul 2002 22:00:18 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Be specific
+X-Envelope-Date: Mon Jul 29 22:00:25 2002
+X-Envelope-Sender: [email protected]
+
+It IS the same thing with you
diff --git a/testsuite/mh/teaparty/19 b/testsuite/mh/teaparty/19
new file mode 100644
index 0000000..7dcf412
--- /dev/null
+++ b/testsuite/mh/teaparty/19
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3319
+	for [email protected]; Mon, 29 Jul 2002 22:00:24 +0100
+Date: Mon, 29 Jul 2002 22:00:19 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Watch
+X-Envelope-Date: Mon Jul 29 22:00:26 2002
+X-Envelope-Sender: [email protected]
+
+What day of the month is it?
diff --git a/testsuite/mh/teaparty/2 b/testsuite/mh/teaparty/2
new file mode 100644
index 0000000..8198cde
--- /dev/null
+++ b/testsuite/mh/teaparty/2
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3302
+	for [email protected]; Mon, 29 Jul 2002 22:00:07 +0100
+Date: Mon, 29 Jul 2002 22:00:02 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:09 2002
+X-Envelope-Sender: [email protected]
+
+I don't see any wine
diff --git a/testsuite/mh/teaparty/20 b/testsuite/mh/teaparty/20
new file mode 100644
index 0000000..fdd1120
--- /dev/null
+++ b/testsuite/mh/teaparty/20
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3320
+	for [email protected]; Mon, 29 Jul 2002 22:00:25 +0100
+Date: Mon, 29 Jul 2002 22:00:20 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:27 2002
+X-Envelope-Sender: [email protected]
+
+The fourth.
diff --git a/testsuite/mh/teaparty/21 b/testsuite/mh/teaparty/21
new file mode 100644
index 0000000..72710e2
--- /dev/null
+++ b/testsuite/mh/teaparty/21
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3321
+	for [email protected]; Mon, 29 Jul 2002 22:00:26 +0100
+Date: Mon, 29 Jul 2002 22:00:21 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:28 2002
+X-Envelope-Sender: [email protected]
+
+Two days wrong! I told you butter wouldn't suit the works!
diff --git a/testsuite/mh/teaparty/22 b/testsuite/mh/teaparty/22
new file mode 100644
index 0000000..bee8e16
--- /dev/null
+++ b/testsuite/mh/teaparty/22
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3322
+	for [email protected]; Mon, 29 Jul 2002 22:00:27 +0100
+Date: Mon, 29 Jul 2002 22:00:22 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:29 2002
+X-Envelope-Sender: [email protected]
+
+It was the BEST butter
diff --git a/testsuite/mh/teaparty/23 b/testsuite/mh/teaparty/23
new file mode 100644
index 0000000..972ad7f
--- /dev/null
+++ b/testsuite/mh/teaparty/23
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3323
+	for [email protected]; Mon, 29 Jul 2002 22:00:28 +0100
+Date: Mon, 29 Jul 2002 22:00:23 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:30 2002
+X-Envelope-Sender: [email protected]
+
+Yes, but some crumbs must have got in as well,
+you shouldn't have put it in with the bread-knife.
diff --git a/testsuite/mh/teaparty/24 b/testsuite/mh/teaparty/24
new file mode 100644
index 0000000..3a57e36
--- /dev/null
+++ b/testsuite/mh/teaparty/24
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3324
+	for [email protected]; Mon, 29 Jul 2002 22:00:29 +0100
+Date: Mon, 29 Jul 2002 22:00:24 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Watch
+X-Envelope-Date: Mon Jul 29 22:00:31 2002
+X-Envelope-Sender: [email protected]
+
+It was the BEST butter, you know.
diff --git a/testsuite/mh/teaparty/25 b/testsuite/mh/teaparty/25
new file mode 100644
index 0000000..c9e3215
--- /dev/null
+++ b/testsuite/mh/teaparty/25
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3325
+	for [email protected]; Mon, 29 Jul 2002 22:00:30 +0100
+Date: Mon, 29 Jul 2002 22:00:25 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Funny watch (was Re: Watch)
+X-Envelope-Date: Mon Jul 29 22:00:32 2002
+X-Envelope-Sender: [email protected]
+
+What a funny watch! It tells the day of the
+month, and doesn't tell what o'clock it is!
diff --git a/testsuite/mh/teaparty/26 b/testsuite/mh/teaparty/26
new file mode 100644
index 0000000..63d0e8a
--- /dev/null
+++ b/testsuite/mh/teaparty/26
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3326
+	for [email protected]; Mon, 29 Jul 2002 22:00:31 +0100
+Date: Mon, 29 Jul 2002 22:00:26 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:33 2002
+X-Envelope-Sender: [email protected]
+
+Why should it? Does YOUR watch tell you what year it is?
diff --git a/testsuite/mh/teaparty/27 b/testsuite/mh/teaparty/27
new file mode 100644
index 0000000..2a6027f
--- /dev/null
+++ b/testsuite/mh/teaparty/27
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3327
+	for [email protected]; Mon, 29 Jul 2002 22:00:32 +0100
+Date: Mon, 29 Jul 2002 22:00:27 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:34 2002
+X-Envelope-Sender: [email protected]
+
+Of course not, but that's because it stays the same year for such
+a long time together.
diff --git a/testsuite/mh/teaparty/28 b/testsuite/mh/teaparty/28
new file mode 100644
index 0000000..4cdcce3
--- /dev/null
+++ b/testsuite/mh/teaparty/28
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3328
+	for [email protected]; Mon, 29 Jul 2002 22:00:33 +0100
+Date: Mon, 29 Jul 2002 22:00:28 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:35 2002
+X-Envelope-Sender: [email protected]
+
+Which is just the case with MINE
diff --git a/testsuite/mh/teaparty/29 b/testsuite/mh/teaparty/29
new file mode 100644
index 0000000..f6b7f24
--- /dev/null
+++ b/testsuite/mh/teaparty/29
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3329
+	for [email protected]; Mon, 29 Jul 2002 22:00:34 +0100
+Date: Mon, 29 Jul 2002 22:00:29 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Funny watch
+X-Envelope-Date: Mon Jul 29 22:00:36 2002
+X-Envelope-Sender: [email protected]
+
+I don't quite understand you
diff --git a/testsuite/mh/teaparty/3 b/testsuite/mh/teaparty/3
new file mode 100644
index 0000000..89f6c97
--- /dev/null
+++ b/testsuite/mh/teaparty/3
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3303
+	for [email protected]; Mon, 29 Jul 2002 22:00:08 +0100
+Date: Mon, 29 Jul 2002 22:00:03 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:10 2002
+X-Envelope-Sender: [email protected]
+
+There isn't any
diff --git a/testsuite/mh/teaparty/30 b/testsuite/mh/teaparty/30
new file mode 100644
index 0000000..9708129
--- /dev/null
+++ b/testsuite/mh/teaparty/30
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3330
+	for [email protected]; Mon, 29 Jul 2002 22:00:35 +0100
+Date: Mon, 29 Jul 2002 22:00:30 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Remark
+X-Envelope-Date: Mon Jul 29 22:00:37 2002
+X-Envelope-Sender: [email protected]
+
+The Dormouse is asleep again
diff --git a/testsuite/mh/teaparty/31 b/testsuite/mh/teaparty/31
new file mode 100644
index 0000000..c86c2d9
--- /dev/null
+++ b/testsuite/mh/teaparty/31
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3331
+	for [email protected]; Mon, 29 Jul 2002 22:00:36 +0100
+Date: Mon, 29 Jul 2002 22:00:31 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Nobody at all  <[email protected]>
+Subject: Re: Remark
+X-Envelope-Date: Mon Jul 29 22:00:38 2002
+X-Envelope-Sender: [email protected]
+
+Of course, of course; just what I was going to
+remark myself.
diff --git a/testsuite/mh/teaparty/32 b/testsuite/mh/teaparty/32
new file mode 100644
index 0000000..d7b3314
--- /dev/null
+++ b/testsuite/mh/teaparty/32
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3332
+	for [email protected]; Mon, 29 Jul 2002 22:00:37 +0100
+Date: Mon, 29 Jul 2002 22:00:32 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:39 2002
+X-Envelope-Sender: [email protected]
+
+Have you guessed the riddle yet?
diff --git a/testsuite/mh/teaparty/33 b/testsuite/mh/teaparty/33
new file mode 100644
index 0000000..34b5d92
--- /dev/null
+++ b/testsuite/mh/teaparty/33
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3333
+	for [email protected]; Mon, 29 Jul 2002 22:00:38 +0100
+Date: Mon, 29 Jul 2002 22:00:33 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:40 2002
+X-Envelope-Sender: [email protected]
+
+No, I give it up, what's the answer?
diff --git a/testsuite/mh/teaparty/34 b/testsuite/mh/teaparty/34
new file mode 100644
index 0000000..e2e976d
--- /dev/null
+++ b/testsuite/mh/teaparty/34
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3334
+	for [email protected]; Mon, 29 Jul 2002 22:00:39 +0100
+Date: Mon, 29 Jul 2002 22:00:34 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:41 2002
+X-Envelope-Sender: [email protected]
+
+I haven't the slightest idea
diff --git a/testsuite/mh/teaparty/35 b/testsuite/mh/teaparty/35
new file mode 100644
index 0000000..e4a67de
--- /dev/null
+++ b/testsuite/mh/teaparty/35
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3335
+	for [email protected]; Mon, 29 Jul 2002 22:00:40 +0100
+Date: Mon, 29 Jul 2002 22:00:35 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:42 2002
+X-Envelope-Sender: [email protected]
+
+Nor I
diff --git a/testsuite/mh/teaparty/36 b/testsuite/mh/teaparty/36
new file mode 100644
index 0000000..fe6ec9b
--- /dev/null
+++ b/testsuite/mh/teaparty/36
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3336
+	for [email protected]; Mon, 29 Jul 2002 22:00:41 +0100
+Date: Mon, 29 Jul 2002 22:00:36 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Re: Riddle
+X-Envelope-Date: Mon Jul 29 22:00:43 2002
+X-Envelope-Sender: [email protected]
+
+I think you might do something better with the time, than waste it in
+asking riddles that have no answers.
diff --git a/testsuite/mh/teaparty/37 b/testsuite/mh/teaparty/37
new file mode 100644
index 0000000..f5066c1
--- /dev/null
+++ b/testsuite/mh/teaparty/37
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3337
+	for [email protected]; Mon, 29 Jul 2002 22:00:42 +0100
+Date: Mon, 29 Jul 2002 22:00:37 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:44 2002
+X-Envelope-Sender: [email protected]
+
+If you knew Time as well as I do, you
+wouldn't talk about wasting IT.  It's HIM.
diff --git a/testsuite/mh/teaparty/38 b/testsuite/mh/teaparty/38
new file mode 100644
index 0000000..60463cc
--- /dev/null
+++ b/testsuite/mh/teaparty/38
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3338
+	for [email protected]; Mon, 29 Jul 2002 22:00:43 +0100
+Date: Mon, 29 Jul 2002 22:00:38 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:45 2002
+X-Envelope-Sender: [email protected]
+
+I don't know what you mean
diff --git a/testsuite/mh/teaparty/39 b/testsuite/mh/teaparty/39
new file mode 100644
index 0000000..8e9741b
--- /dev/null
+++ b/testsuite/mh/teaparty/39
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3339
+	for [email protected]; Mon, 29 Jul 2002 22:00:44 +0100
+Date: Mon, 29 Jul 2002 22:00:39 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:46 2002
+X-Envelope-Sender: [email protected]
+
+Of course you don't! I dare say you never even spoke to Time!
diff --git a/testsuite/mh/teaparty/4 b/testsuite/mh/teaparty/4
new file mode 100644
index 0000000..08d2364
--- /dev/null
+++ b/testsuite/mh/teaparty/4
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3304
+	for [email protected]; Mon, 29 Jul 2002 22:00:09 +0100
+Date: Mon, 29 Jul 2002 22:00:04 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:11 2002
+X-Envelope-Sender: [email protected]
+
+Then it wasn't very civil of you to offer it
diff --git a/testsuite/mh/teaparty/40 b/testsuite/mh/teaparty/40
new file mode 100644
index 0000000..08aeb81
--- /dev/null
+++ b/testsuite/mh/teaparty/40
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3340
+	for [email protected]; Mon, 29 Jul 2002 22:00:45 +0100
+Date: Mon, 29 Jul 2002 22:00:40 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:47 2002
+X-Envelope-Sender: [email protected]
+
+Perhaps not, but I know I have to beat time when I learn music.
diff --git a/testsuite/mh/teaparty/41 b/testsuite/mh/teaparty/41
new file mode 100644
index 0000000..e3e0b1b
--- /dev/null
+++ b/testsuite/mh/teaparty/41
@@ -0,0 +1,17 @@
+Received: (from [email protected]) 
+	by wonder.land id 3341
+	for [email protected]; Mon, 29 Jul 2002 22:00:46 +0100
+Date: Mon, 29 Jul 2002 22:00:41 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:48 2002
+X-Envelope-Sender: [email protected]
+
+Ah! that accounts for it. He won't stand
+beating.  Now, if you only kept on good terms with him, he'd do
+almost anything you liked with the clock.  For instance, suppose
+it were nine o'clock in the morning, just time to begin lessons:
+you'd only have to whisper a hint to Time, and round goes the
+clock in a twinkling!  Half-past one, time for dinner!
diff --git a/testsuite/mh/teaparty/42 b/testsuite/mh/teaparty/42
new file mode 100644
index 0000000..caeb7aa
--- /dev/null
+++ b/testsuite/mh/teaparty/42
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3342
+	for [email protected]; Mon, 29 Jul 2002 22:00:47 +0100
+Date: Mon, 29 Jul 2002 22:00:42 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Thought apart Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:49 2002
+X-Envelope-Sender: [email protected]
+
+I only wish it was
diff --git a/testsuite/mh/teaparty/43 b/testsuite/mh/teaparty/43
new file mode 100644
index 0000000..b934283
--- /dev/null
+++ b/testsuite/mh/teaparty/43
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3343
+	for [email protected]; Mon, 29 Jul 2002 22:00:48 +0100
+Date: Mon, 29 Jul 2002 22:00:43 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:50 2002
+X-Envelope-Sender: [email protected]
+
+That would be grand, certainly, but then--I shouldn't be hungry for it,
+you know.
diff --git a/testsuite/mh/teaparty/44 b/testsuite/mh/teaparty/44
new file mode 100644
index 0000000..6b4260e
--- /dev/null
+++ b/testsuite/mh/teaparty/44
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3344
+	for [email protected]; Mon, 29 Jul 2002 22:00:49 +0100
+Date: Mon, 29 Jul 2002 22:00:44 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:51 2002
+X-Envelope-Sender: [email protected]
+
+Not at first, perhaps, but you could keep
+it to half-past one as long as you liked.
diff --git a/testsuite/mh/teaparty/45 b/testsuite/mh/teaparty/45
new file mode 100644
index 0000000..96552b3
--- /dev/null
+++ b/testsuite/mh/teaparty/45
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3345
+	for [email protected]; Mon, 29 Jul 2002 22:00:50 +0100
+Date: Mon, 29 Jul 2002 22:00:45 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:52 2002
+X-Envelope-Sender: [email protected]
+
+Is that the way YOU manage?
diff --git a/testsuite/mh/teaparty/46 b/testsuite/mh/teaparty/46
new file mode 100644
index 0000000..923cd49
--- /dev/null
+++ b/testsuite/mh/teaparty/46
@@ -0,0 +1,19 @@
+Received: (from [email protected]) 
+	by wonder.land id 3346
+	for [email protected]; Mon, 29 Jul 2002 22:00:51 +0100
+Date: Mon, 29 Jul 2002 22:00:46 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:53 2002
+X-Envelope-Sender: [email protected]
+
+Not I! We quarrelled last March--just before HE went mad, you know--
+it was at the great concert given by the Queen of Hearts, and I had
+to sing
+
+"Twinkle, twinkle, little bat!
+How I wonder what you're at!"
+
+You know the song, perhaps?
diff --git a/testsuite/mh/teaparty/47 b/testsuite/mh/teaparty/47
new file mode 100644
index 0000000..bcde04b
--- /dev/null
+++ b/testsuite/mh/teaparty/47
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3347
+	for [email protected]; Mon, 29 Jul 2002 22:00:52 +0100
+Date: Mon, 29 Jul 2002 22:00:47 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:54 2002
+X-Envelope-Sender: [email protected]
+
+I've heard something like it
diff --git a/testsuite/mh/teaparty/48 b/testsuite/mh/teaparty/48
new file mode 100644
index 0000000..6053fa9
--- /dev/null
+++ b/testsuite/mh/teaparty/48
@@ -0,0 +1,16 @@
+Received: (from [email protected]) 
+	by wonder.land id 3348
+	for [email protected]; Mon, 29 Jul 2002 22:00:53 +0100
+Date: Mon, 29 Jul 2002 22:00:48 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:55 2002
+X-Envelope-Sender: [email protected]
+
+It goes on, you know in this way:--
+
+"Up above the world you fly,
+Like a tea-tray in the sky.
+Twinkle, twinkle--"'
diff --git a/testsuite/mh/teaparty/49 b/testsuite/mh/teaparty/49
new file mode 100644
index 0000000..b09e586
--- /dev/null
+++ b/testsuite/mh/teaparty/49
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3349
+	for [email protected]; Mon, 29 Jul 2002 22:00:54 +0100
+Date: Mon, 29 Jul 2002 22:00:49 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Nobody at all  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:56 2002
+X-Envelope-Sender: [email protected]
+
+Twinkle, twinkle, twinkle, twinkle...
diff --git a/testsuite/mh/teaparty/5 b/testsuite/mh/teaparty/5
new file mode 100644
index 0000000..3055873
--- /dev/null
+++ b/testsuite/mh/teaparty/5
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3305
+	for [email protected]; Mon, 29 Jul 2002 22:00:10 +0100
+Date: Mon, 29 Jul 2002 22:00:05 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:12 2002
+X-Envelope-Sender: [email protected]
+
+It wasn't very civil of you to sit down without being invited
diff --git a/testsuite/mh/teaparty/50 b/testsuite/mh/teaparty/50
new file mode 100644
index 0000000..abbcb11
--- /dev/null
+++ b/testsuite/mh/teaparty/50
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3350
+	for [email protected]; Mon, 29 Jul 2002 22:00:55 +0100
+Date: Mon, 29 Jul 2002 22:00:50 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:57 2002
+X-Envelope-Sender: [email protected]
+
+Well, I'd hardly finished the first verse, when the Queen jumped up
+and bawled out, "He's murdering the time!  Off with his head!"
diff --git a/testsuite/mh/teaparty/51 b/testsuite/mh/teaparty/51
new file mode 100644
index 0000000..2548447
--- /dev/null
+++ b/testsuite/mh/teaparty/51
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3351
+	for [email protected]; Mon, 29 Jul 2002 22:00:56 +0100
+Date: Mon, 29 Jul 2002 22:00:51 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:58 2002
+X-Envelope-Sender: [email protected]
+
+How dreadfully savage!
diff --git a/testsuite/mh/teaparty/52 b/testsuite/mh/teaparty/52
new file mode 100644
index 0000000..de0be44
--- /dev/null
+++ b/testsuite/mh/teaparty/52
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3352
+	for [email protected]; Mon, 29 Jul 2002 22:00:57 +0100
+Date: Mon, 29 Jul 2002 22:00:52 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Discussing Time
+X-Envelope-Date: Mon Jul 29 22:00:59 2002
+X-Envelope-Sender: [email protected]
+
+And ever since that, he won't do a thing I ask!  It's always six o'clock now.
diff --git a/testsuite/mh/teaparty/53 b/testsuite/mh/teaparty/53
new file mode 100644
index 0000000..540e432
--- /dev/null
+++ b/testsuite/mh/teaparty/53
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3353
+	for [email protected]; Mon, 29 Jul 2002 22:00:58 +0100
+Date: Mon, 29 Jul 2002 22:00:53 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: A guess (was Re: Discussing Time)
+X-Envelope-Date: Mon Jul 29 22:01:00 2002
+X-Envelope-Sender: [email protected]
+
+Is that the reason so
+many tea-things are put out here?
diff --git a/testsuite/mh/teaparty/54 b/testsuite/mh/teaparty/54
new file mode 100644
index 0000000..474b696
--- /dev/null
+++ b/testsuite/mh/teaparty/54
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3354
+	for [email protected]; Mon, 29 Jul 2002 22:00:59 +0100
+Date: Mon, 29 Jul 2002 22:00:54 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:01 2002
+X-Envelope-Sender: [email protected]
+
+Yes, that's it. It's always
+tea-time, and we've no time to wash the things between whiles.
diff --git a/testsuite/mh/teaparty/55 b/testsuite/mh/teaparty/55
new file mode 100644
index 0000000..4eae0d8
--- /dev/null
+++ b/testsuite/mh/teaparty/55
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3355
+	for [email protected]; Mon, 29 Jul 2002 22:01:00 +0100
+Date: Mon, 29 Jul 2002 22:00:55 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:02 2002
+X-Envelope-Sender: [email protected]
+
+Then you keep moving round, I suppose?
diff --git a/testsuite/mh/teaparty/56 b/testsuite/mh/teaparty/56
new file mode 100644
index 0000000..7f42cb2
--- /dev/null
+++ b/testsuite/mh/teaparty/56
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3356
+	for [email protected]; Mon, 29 Jul 2002 22:01:01 +0100
+Date: Mon, 29 Jul 2002 22:00:56 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:03 2002
+X-Envelope-Sender: [email protected]
+
+Exactly so, as the things get used up.
diff --git a/testsuite/mh/teaparty/57 b/testsuite/mh/teaparty/57
new file mode 100644
index 0000000..d4641f5
--- /dev/null
+++ b/testsuite/mh/teaparty/57
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3357
+	for [email protected]; Mon, 29 Jul 2002 22:01:02 +0100
+Date: Mon, 29 Jul 2002 22:00:57 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Re: A guess
+X-Envelope-Date: Mon Jul 29 22:01:04 2002
+X-Envelope-Sender: [email protected]
+
+But what happens when you come to the beginning again?
diff --git a/testsuite/mh/teaparty/58 b/testsuite/mh/teaparty/58
new file mode 100644
index 0000000..5eef9fe
--- /dev/null
+++ b/testsuite/mh/teaparty/58
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3358
+	for [email protected]; Mon, 29 Jul 2002 22:01:03 +0100
+Date: Mon, 29 Jul 2002 22:00:58 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Request for a story (was Re: A guess)
+X-Envelope-Date: Mon Jul 29 22:01:05 2002
+X-Envelope-Sender: [email protected]
+
+Suppose we change the subject, I'm getting tired of this.
+I vote the young lady tells us a story.
diff --git a/testsuite/mh/teaparty/59 b/testsuite/mh/teaparty/59
new file mode 100644
index 0000000..a2c8633
--- /dev/null
+++ b/testsuite/mh/teaparty/59
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3359
+	for [email protected]; Mon, 29 Jul 2002 22:01:04 +0100
+Date: Mon, 29 Jul 2002 22:00:59 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:06 2002
+X-Envelope-Sender: [email protected]
+
+I'm afraid I don't know one
diff --git a/testsuite/mh/teaparty/6 b/testsuite/mh/teaparty/6
new file mode 100644
index 0000000..485ed70
--- /dev/null
+++ b/testsuite/mh/teaparty/6
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3306
+	for [email protected]; Mon, 29 Jul 2002 22:00:11 +0100
+Date: Mon, 29 Jul 2002 22:00:06 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Invitation
+X-Envelope-Date: Mon Jul 29 22:00:13 2002
+X-Envelope-Sender: [email protected]
+
+I didn't know it was YOUR table, it's laid for a
+great many more than three.
diff --git a/testsuite/mh/teaparty/60 b/testsuite/mh/teaparty/60
new file mode 100644
index 0000000..98e8389
--- /dev/null
+++ b/testsuite/mh/teaparty/60
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3360
+	for [email protected]; Mon, 29 Jul 2002 22:01:05 +0100
+Date: Mon, 29 Jul 2002 22:01:00 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Cc: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:07 2002
+X-Envelope-Sender: [email protected]
+
+Then the Dormouse shall!
+Wake up, Dormouse!
diff --git a/testsuite/mh/teaparty/61 b/testsuite/mh/teaparty/61
new file mode 100644
index 0000000..0e61312
--- /dev/null
+++ b/testsuite/mh/teaparty/61
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3361
+	for [email protected]; Mon, 29 Jul 2002 22:01:06 +0100
+Date: Mon, 29 Jul 2002 22:01:01 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:08 2002
+X-Envelope-Sender: [email protected]
+
+I wasn't asleep. I heard every word you fellows
+were saying.
diff --git a/testsuite/mh/teaparty/62 b/testsuite/mh/teaparty/62
new file mode 100644
index 0000000..8521852
--- /dev/null
+++ b/testsuite/mh/teaparty/62
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3362
+	for [email protected]; Mon, 29 Jul 2002 22:01:07 +0100
+Date: Mon, 29 Jul 2002 22:01:02 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:09 2002
+X-Envelope-Sender: [email protected]
+
+Tell us a story!
diff --git a/testsuite/mh/teaparty/63 b/testsuite/mh/teaparty/63
new file mode 100644
index 0000000..82bd28e
--- /dev/null
+++ b/testsuite/mh/teaparty/63
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3363
+	for [email protected]; Mon, 29 Jul 2002 22:01:08 +0100
+Date: Mon, 29 Jul 2002 22:01:03 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:10 2002
+X-Envelope-Sender: [email protected]
+
+Yes, please do!
diff --git a/testsuite/mh/teaparty/64 b/testsuite/mh/teaparty/64
new file mode 100644
index 0000000..363b505
--- /dev/null
+++ b/testsuite/mh/teaparty/64
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3364
+	for [email protected]; Mon, 29 Jul 2002 22:01:09 +0100
+Date: Mon, 29 Jul 2002 22:01:04 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Request for a story
+X-Envelope-Date: Mon Jul 29 22:01:11 2002
+X-Envelope-Sender: [email protected]
+
+And be quick about it, or you'll be asleep
+again before it's done.
diff --git a/testsuite/mh/teaparty/65 b/testsuite/mh/teaparty/65
new file mode 100644
index 0000000..97578c1
--- /dev/null
+++ b/testsuite/mh/teaparty/65
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3365
+	for [email protected]; Mon, 29 Jul 2002 22:01:10 +0100
+Date: Mon, 29 Jul 2002 22:01:05 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Story (was Re: Request for a story)
+X-Envelope-Date: Mon Jul 29 22:01:12 2002
+X-Envelope-Sender: [email protected]
+
+Once upon a time there were three little sisters, and their names
+were Elsie,
+Lacie, and Tillie; and they lived at the bottom of a well--
diff --git a/testsuite/mh/teaparty/66 b/testsuite/mh/teaparty/66
new file mode 100644
index 0000000..8d0e2b8
--- /dev/null
+++ b/testsuite/mh/teaparty/66
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3366
+	for [email protected]; Mon, 29 Jul 2002 22:01:11 +0100
+Date: Mon, 29 Jul 2002 22:01:06 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:13 2002
+X-Envelope-Sender: [email protected]
+
+What did they live on?
diff --git a/testsuite/mh/teaparty/67 b/testsuite/mh/teaparty/67
new file mode 100644
index 0000000..6144ca5
--- /dev/null
+++ b/testsuite/mh/teaparty/67
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3367
+	for [email protected]; Mon, 29 Jul 2002 22:01:12 +0100
+Date: Mon, 29 Jul 2002 22:01:07 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:14 2002
+X-Envelope-Sender: [email protected]
+
+They lived on treacle
diff --git a/testsuite/mh/teaparty/68 b/testsuite/mh/teaparty/68
new file mode 100644
index 0000000..65d543d
--- /dev/null
+++ b/testsuite/mh/teaparty/68
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3368
+	for [email protected]; Mon, 29 Jul 2002 22:01:13 +0100
+Date: Mon, 29 Jul 2002 22:01:08 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:15 2002
+X-Envelope-Sender: [email protected]
+
+They couldn't have done that, you know, they'd have been ill
diff --git a/testsuite/mh/teaparty/69 b/testsuite/mh/teaparty/69
new file mode 100644
index 0000000..d519e9a
--- /dev/null
+++ b/testsuite/mh/teaparty/69
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3369
+	for [email protected]; Mon, 29 Jul 2002 22:01:14 +0100
+Date: Mon, 29 Jul 2002 22:01:09 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:16 2002
+X-Envelope-Sender: [email protected]
+
+So they were, VERY ill.
diff --git a/testsuite/mh/teaparty/7 b/testsuite/mh/teaparty/7
new file mode 100644
index 0000000..a400f0c
--- /dev/null
+++ b/testsuite/mh/teaparty/7
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3307
+	for [email protected]; Mon, 29 Jul 2002 22:00:12 +0100
+Date: Mon, 29 Jul 2002 22:00:07 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Personal remark
+X-Envelope-Date: Mon Jul 29 22:00:14 2002
+X-Envelope-Sender: [email protected]
+
+Your hair wants cutting
diff --git a/testsuite/mh/teaparty/70 b/testsuite/mh/teaparty/70
new file mode 100644
index 0000000..a593cce
--- /dev/null
+++ b/testsuite/mh/teaparty/70
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3370
+	for [email protected]; Mon, 29 Jul 2002 22:01:15 +0100
+Date: Mon, 29 Jul 2002 22:01:10 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:17 2002
+X-Envelope-Sender: [email protected]
+
+But why did they live at the bottom of a well?
diff --git a/testsuite/mh/teaparty/71 b/testsuite/mh/teaparty/71
new file mode 100644
index 0000000..e29ab6d
--- /dev/null
+++ b/testsuite/mh/teaparty/71
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3371
+	for [email protected]; Mon, 29 Jul 2002 22:01:16 +0100
+Date: Mon, 29 Jul 2002 22:01:11 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Remark
+X-Envelope-Date: Mon Jul 29 22:01:18 2002
+X-Envelope-Sender: [email protected]
+
+Take some more tea
diff --git a/testsuite/mh/teaparty/72 b/testsuite/mh/teaparty/72
new file mode 100644
index 0000000..31befeb
--- /dev/null
+++ b/testsuite/mh/teaparty/72
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3372
+	for [email protected]; Mon, 29 Jul 2002 22:01:17 +0100
+Date: Mon, 29 Jul 2002 22:01:12 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Remark
+X-Envelope-Date: Mon Jul 29 22:01:19 2002
+X-Envelope-Sender: [email protected]
+
+I've had nothing yet, so
+I can't take more.
diff --git a/testsuite/mh/teaparty/73 b/testsuite/mh/teaparty/73
new file mode 100644
index 0000000..7f2dacb
--- /dev/null
+++ b/testsuite/mh/teaparty/73
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3373
+	for [email protected]; Mon, 29 Jul 2002 22:01:18 +0100
+Date: Mon, 29 Jul 2002 22:01:13 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Remark
+X-Envelope-Date: Mon Jul 29 22:01:20 2002
+X-Envelope-Sender: [email protected]
+
+You mean you can't take LESS, it's very
+easy to take MORE than nothing.
diff --git a/testsuite/mh/teaparty/74 b/testsuite/mh/teaparty/74
new file mode 100644
index 0000000..66eefe7
--- /dev/null
+++ b/testsuite/mh/teaparty/74
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3374
+	for [email protected]; Mon, 29 Jul 2002 22:01:19 +0100
+Date: Mon, 29 Jul 2002 22:01:14 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Hatter  <[email protected]>
+Subject: Personal remark
+X-Envelope-Date: Mon Jul 29 22:01:21 2002
+X-Envelope-Sender: [email protected]
+
+Nobody asked YOUR opinion
diff --git a/testsuite/mh/teaparty/75 b/testsuite/mh/teaparty/75
new file mode 100644
index 0000000..b2c91fe
--- /dev/null
+++ b/testsuite/mh/teaparty/75
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3375
+	for [email protected]; Mon, 29 Jul 2002 22:01:20 +0100
+Date: Mon, 29 Jul 2002 22:01:15 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Personal remark
+X-Envelope-Date: Mon Jul 29 22:01:22 2002
+X-Envelope-Sender: [email protected]
+
+Who's making personal remarks now?
diff --git a/testsuite/mh/teaparty/76 b/testsuite/mh/teaparty/76
new file mode 100644
index 0000000..df08e45
--- /dev/null
+++ b/testsuite/mh/teaparty/76
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3376
+	for [email protected]; Mon, 29 Jul 2002 22:01:21 +0100
+Date: Mon, 29 Jul 2002 22:01:16 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:23 2002
+X-Envelope-Sender: [email protected]
+
+Why did they live at the
+bottom of a well?
diff --git a/testsuite/mh/teaparty/77 b/testsuite/mh/teaparty/77
new file mode 100644
index 0000000..0876b64
--- /dev/null
+++ b/testsuite/mh/teaparty/77
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3377
+	for [email protected]; Mon, 29 Jul 2002 22:01:22 +0100
+Date: Mon, 29 Jul 2002 22:01:17 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:24 2002
+X-Envelope-Sender: [email protected]
+
+It was a treacle-well.
diff --git a/testsuite/mh/teaparty/78 b/testsuite/mh/teaparty/78
new file mode 100644
index 0000000..a139ad0
--- /dev/null
+++ b/testsuite/mh/teaparty/78
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3378
+	for [email protected]; Mon, 29 Jul 2002 22:01:23 +0100
+Date: Mon, 29 Jul 2002 22:01:18 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:25 2002
+X-Envelope-Sender: [email protected]
+
+There's no such thing!
diff --git a/testsuite/mh/teaparty/79 b/testsuite/mh/teaparty/79
new file mode 100644
index 0000000..cb9dd8a
--- /dev/null
+++ b/testsuite/mh/teaparty/79
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3379
+	for [email protected]; Mon, 29 Jul 2002 22:01:24 +0100
+Date: Mon, 29 Jul 2002 22:01:19 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:26 2002
+X-Envelope-Sender: [email protected]
+
+If you can't be civil, you'd better finish the
+story for yourself.
diff --git a/testsuite/mh/teaparty/8 b/testsuite/mh/teaparty/8
new file mode 100644
index 0000000..9a9d536
--- /dev/null
+++ b/testsuite/mh/teaparty/8
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3308
+	for [email protected]; Mon, 29 Jul 2002 22:00:13 +0100
+Date: Mon, 29 Jul 2002 22:00:08 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: March Hare  <[email protected]>
+Subject: Re: Personal remark
+X-Envelope-Date: Mon Jul 29 22:00:15 2002
+X-Envelope-Sender: [email protected]
+
+You should learn not to make personal remarks, it's very rude.
diff --git a/testsuite/mh/teaparty/80 b/testsuite/mh/teaparty/80
new file mode 100644
index 0000000..0b6ffdc
--- /dev/null
+++ b/testsuite/mh/teaparty/80
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3380
+	for [email protected]; Mon, 29 Jul 2002 22:01:25 +0100
+Date: Mon, 29 Jul 2002 22:01:20 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:27 2002
+X-Envelope-Sender: [email protected]
+
+No, please go on! I won't interrupt
+again.  I dare say there may be ONE.
diff --git a/testsuite/mh/teaparty/81 b/testsuite/mh/teaparty/81
new file mode 100644
index 0000000..6b4f8ab
--- /dev/null
+++ b/testsuite/mh/teaparty/81
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3381
+	for [email protected]; Mon, 29 Jul 2002 22:01:26 +0100
+Date: Mon, 29 Jul 2002 22:01:21 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:28 2002
+X-Envelope-Sender: [email protected]
+
+One, indeed! And so these three little sisters--they
+were learning to draw, you know--
diff --git a/testsuite/mh/teaparty/82 b/testsuite/mh/teaparty/82
new file mode 100644
index 0000000..0b89032
--- /dev/null
+++ b/testsuite/mh/teaparty/82
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3382
+	for [email protected]; Mon, 29 Jul 2002 22:01:27 +0100
+Date: Mon, 29 Jul 2002 22:01:22 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:29 2002
+X-Envelope-Sender: [email protected]
+
+What did they draw?
diff --git a/testsuite/mh/teaparty/83 b/testsuite/mh/teaparty/83
new file mode 100644
index 0000000..e9a25bc
--- /dev/null
+++ b/testsuite/mh/teaparty/83
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3383
+	for [email protected]; Mon, 29 Jul 2002 22:01:28 +0100
+Date: Mon, 29 Jul 2002 22:01:23 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:30 2002
+X-Envelope-Sender: [email protected]
+
+Treacle.
diff --git a/testsuite/mh/teaparty/84 b/testsuite/mh/teaparty/84
new file mode 100644
index 0000000..b0777ca
--- /dev/null
+++ b/testsuite/mh/teaparty/84
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3384
+	for [email protected]; Mon, 29 Jul 2002 22:01:29 +0100
+Date: Mon, 29 Jul 2002 22:01:24 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Mad Tea Party  <[email protected]>
+Subject: Let's move
+X-Envelope-Date: Mon Jul 29 22:01:31 2002
+X-Envelope-Sender: [email protected]
+
+I want a clean cup, let's all move
+one place on.
diff --git a/testsuite/mh/teaparty/85 b/testsuite/mh/teaparty/85
new file mode 100644
index 0000000..fec270e
--- /dev/null
+++ b/testsuite/mh/teaparty/85
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3385
+	for [email protected]; Mon, 29 Jul 2002 22:01:30 +0100
+Date: Mon, 29 Jul 2002 22:01:25 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:32 2002
+X-Envelope-Sender: [email protected]
+
+But I don't understand.  Where did they draw
+the treacle from?
diff --git a/testsuite/mh/teaparty/86 b/testsuite/mh/teaparty/86
new file mode 100644
index 0000000..0d2dcc2
--- /dev/null
+++ b/testsuite/mh/teaparty/86
@@ -0,0 +1,14 @@
+Received: (from [email protected]) 
+	by wonder.land id 3386
+	for [email protected]; Mon, 29 Jul 2002 22:01:31 +0100
+Date: Mon, 29 Jul 2002 22:01:26 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:33 2002
+X-Envelope-Sender: [email protected]
+
+You can draw water out of a water-well, so
+I should think you could draw treacle out of a treacle-well--eh,
+stupid?
diff --git a/testsuite/mh/teaparty/87 b/testsuite/mh/teaparty/87
new file mode 100644
index 0000000..84d89e1
--- /dev/null
+++ b/testsuite/mh/teaparty/87
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3387
+	for [email protected]; Mon, 29 Jul 2002 22:01:32 +0100
+Date: Mon, 29 Jul 2002 22:01:27 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:34 2002
+X-Envelope-Sender: [email protected]
+
+But they were IN the well
diff --git a/testsuite/mh/teaparty/88 b/testsuite/mh/teaparty/88
new file mode 100644
index 0000000..2c1e82b
--- /dev/null
+++ b/testsuite/mh/teaparty/88
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3388
+	for [email protected]; Mon, 29 Jul 2002 22:01:33 +0100
+Date: Mon, 29 Jul 2002 22:01:28 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:35 2002
+X-Envelope-Sender: [email protected]
+
+Of course they were -- well in
diff --git a/testsuite/mh/teaparty/89 b/testsuite/mh/teaparty/89
new file mode 100644
index 0000000..eb40349
--- /dev/null
+++ b/testsuite/mh/teaparty/89
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3389
+	for [email protected]; Mon, 29 Jul 2002 22:01:34 +0100
+Date: Mon, 29 Jul 2002 22:01:29 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:36 2002
+X-Envelope-Sender: [email protected]
+
+They were learning to draw, and they drew
+all manner of things--everything that begins with an M--
diff --git a/testsuite/mh/teaparty/9 b/testsuite/mh/teaparty/9
new file mode 100644
index 0000000..e355ebb
--- /dev/null
+++ b/testsuite/mh/teaparty/9
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3309
+	for [email protected]; Mon, 29 Jul 2002 22:00:14 +0100
+Date: Mon, 29 Jul 2002 22:00:09 +0100
+From: March Hare  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Riddle (was Re: Personal remark)
+X-Envelope-Date: Mon Jul 29 22:00:16 2002
+X-Envelope-Sender: [email protected]
+
+Why is a raven like a writing-desk?
diff --git a/testsuite/mh/teaparty/90 b/testsuite/mh/teaparty/90
new file mode 100644
index 0000000..b3bcd05
--- /dev/null
+++ b/testsuite/mh/teaparty/90
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3390
+	for [email protected]; Mon, 29 Jul 2002 22:01:35 +0100
+Date: Mon, 29 Jul 2002 22:01:30 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:37 2002
+X-Envelope-Sender: [email protected]
+
+Why with an M?
diff --git a/testsuite/mh/teaparty/91 b/testsuite/mh/teaparty/91
new file mode 100644
index 0000000..0a67711
--- /dev/null
+++ b/testsuite/mh/teaparty/91
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3391
+	for [email protected]; Mon, 29 Jul 2002 22:01:36 +0100
+Date: Mon, 29 Jul 2002 22:01:31 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:38 2002
+X-Envelope-Sender: [email protected]
+
+Why not?
diff --git a/testsuite/mh/teaparty/92 b/testsuite/mh/teaparty/92
new file mode 100644
index 0000000..b3ab656
--- /dev/null
+++ b/testsuite/mh/teaparty/92
@@ -0,0 +1,15 @@
+Received: (from [email protected]) 
+	by wonder.land id 3392
+	for [email protected]; Mon, 29 Jul 2002 22:01:37 +0100
+Date: Mon, 29 Jul 2002 22:01:32 +0100
+From: Dormouse  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:39 2002
+X-Envelope-Sender: [email protected]
+
+--that begins with an
+M, such as mouse-traps, and the moon, and memory, and muchness--
+you know you say things are "much of a muchness" --did you ever
+see such a thing as a drawing of a muchness?
diff --git a/testsuite/mh/teaparty/93 b/testsuite/mh/teaparty/93
new file mode 100644
index 0000000..cc63dad
--- /dev/null
+++ b/testsuite/mh/teaparty/93
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3393
+	for [email protected]; Mon, 29 Jul 2002 22:01:38 +0100
+Date: Mon, 29 Jul 2002 22:01:33 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Dormouse  <[email protected]>
+Subject: Re: Story
+X-Envelope-Date: Mon Jul 29 22:01:40 2002
+X-Envelope-Sender: [email protected]
+
+Really, now you ask me, I don't think--
diff --git a/testsuite/mh/teaparty/94 b/testsuite/mh/teaparty/94
new file mode 100644
index 0000000..3bdce57
--- /dev/null
+++ b/testsuite/mh/teaparty/94
@@ -0,0 +1,12 @@
+Received: (from [email protected]) 
+	by wonder.land id 3394
+	for [email protected]; Mon, 29 Jul 2002 22:01:39 +0100
+Date: Mon, 29 Jul 2002 22:01:34 +0100
+From: Hatter  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Rude remark
+X-Envelope-Date: Mon Jul 29 22:01:41 2002
+X-Envelope-Sender: [email protected]
+
+Then you shouldn't talk
diff --git a/testsuite/mh/teaparty/95 b/testsuite/mh/teaparty/95
new file mode 100644
index 0000000..20ae888
--- /dev/null
+++ b/testsuite/mh/teaparty/95
@@ -0,0 +1,13 @@
+Received: (from [email protected]) 
+	by wonder.land id 3395
+	for [email protected]; Mon, 29 Jul 2002 22:01:40 +0100
+Date: Mon, 29 Jul 2002 22:01:35 +0100
+From: Alice  <[email protected]>
+Message-Id: <[email protected]>
+To: Alice  <[email protected]>
+Subject: Thoughts
+X-Envelope-Date: Mon Jul 29 22:01:42 2002
+X-Envelope-Sender: [email protected]
+
+At any rate I'll never go THERE again! It's the stupidest tea-party I
+ever was at in all my life!
diff --git a/testsuite/mime.at b/testsuite/mime.at
new file mode 100644
index 0000000..3e1c1dd
--- /dev/null
+++ b/testsuite/mime.at
@@ -0,0 +1,220 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite. 
+
+AT_SETUP([mime])
+
+# FIXME: Mimetest should probably be fixed to avoid the use of `tr'
+# and `sed' here.
+AT_CHECK([mimetest -i 0 -p $abs_top_srcdir/testsuite/spool/mbox1 | dnl
+          tr '\t' ' ' | sed 's/  *$//'],
+[0],
+[Message: 1
+From: Foo Bar <[email protected]>
+Subject: Jabberwocky
+Number of parts in message - 1
+Total message size - 1254/44
+Type of part 1 = 
+Message part size - 1254/44: 317/9, 937/35
+Text Message
+Begin
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+`Beware the Jabberwock, my son!
+The jaws that bite, the claws that catch!
+Beware the Jujub bird, and shun
+The frumious Bandersnatch!'
+
+He took his vorpal sword in hand:
+Long time the manxome foe he sought --
+So rested he by the Tumtum gree,
+And stood awhile in thought.
+
+And as in uffish thought he stood,
+The Jabberwock, with eyes of flame,
+Came whiffling through the tulgey wook,
+And burbled as it came!
+
+One, two!  One, two!  And through and through
+The vorpal blade went snicker-snack!
+He left it dead, and with its head
+He went galumphing back.
+
+`And has thou slain the Jabberwock?
+Come to my arms, my beamish boy!
+O frabjous day!  Calloh!  Callay!
+He chortled in his joy.
+
+`Twas brillig, and the slithy toves
+Did gyre and gimble in the wabe;
+All mimsy were the borogoves,
+And the mome raths outgrabe.
+
+
+End
+Message: 2
+From: Bar <[email protected]>
+Subject: Re: Jabberwocky
+Number of parts in message - 1
+Total message size - 534/13
+Type of part 1 = 
+Message part size - 534/13: 319/9, 215/4
+Text Message
+Begin
+It seems very pretty, but it's *rather* hard to understand!'
+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...
+
+End
+Message: 3
+From: Sergey Poznyakoff <[email protected]>
+Subject: Simple MIME
+Number of parts in message - 2
+Total message size - 1625/42
+Type of part 1 = text/plain
+Message part size - 371/13: 141/4, 230/9
+Text Message
+Begin
+How doth the little crocodile
+Improve his shining tail,
+And pour the waters of the Nile
+On every golden scale!
+
+`How cheerfully he seems to grin,
+How neatly spread his claws,
+And welcome little fishes in
+With gently smiling jaws!
+
+End
+Type of part 2 = application/octet-stream
+Message part size - 645/11: 183/5, 462/6
+Attachment - saving [[msg.21]]
+Begin
+`You are old, Father William,' the young man said,
+`And your hair has become very white;
+And yet you incessantly stand on your head--
+Do you think, at your age, it is right?'
+
+`In my youth,' Father William replied to his son,
+`I feared it might injure the brain;
+But, now that I'm perfectly sure I have none,
+Why, I do it again and again.'
+
+
+End
+Message: 4
+From: Sergey Poznyakoff <[email protected]>
+Subject: Nested MIME
+Number of parts in message - 2
+Total message size - 3483/84
+Type of part 1 = text/plain
+Message part size - 496/14: 155/4, 341/10
+Text Message
+Begin
+`You are old, Father William,' the young man said,
+`And your hair has become very white;
+And yet you incessantly stand on your head--
+Do you think, at your age, it is right?'
+
+`In my youth,' Father William replied to his son,
+`I feared it might injure the brain;
+But, now that I'm perfectly sure I have none,
+Why, I do it again and again.'
+
+
+End
+Type of part 2 = multipart/mixed
+Message part size - 2378/52: 114/3, 2264/49
+Encapsulated message : 	
+Begin
+Type of part 1 = application/octet-stream
+Message part size - 663/12: 184/5, 479/7
+Attachment - saving [[msg.22]]
+Begin
+`You are old,' said the youth, `as I mentioned before,
+And have grown most uncommonly fat;
+Yet you turned a back-somersault in at the door--
+Pray, what is the reason of that?'
+
+`In my youth,' said the sage, as he shook his grey locks,
+`I kept all my limbs very supple
+By the use of this ointment--one shilling the box--
+Allow me to sell you a couple?'
+
+End
+Type of part 2 = multipart/mixed
+Message part size - 1531/32: 114/3, 1417/29
+Encapsulated message : 	
+Begin
+Type of part 1 = application/octet-stream
+Message part size - 668/12: 185/5, 483/7
+Attachment - saving [[msg.23]]
+Begin
+`You are old,' said the youth, `and your jaws are too weak
+For anything tougher than suet;
+Yet you finished the goose, with the bones and the beak--
+Pray how did you manage to do it?'
+
+`In my youth,' said his father, `I took to the law,
+And argued each case with my wife;
+And the muscular strength, which it gave to my jaw,
+Has lasted the rest of my life.'
+
+End
+Type of part 2 = application/octet-stream
+Message part size - 679/12: 184/5, 495/7
+Attachment - saving [[msg.24]]
+Begin
+`You are old,' said the youth, `one would hardly suppose
+That your eye was as steady as ever;
+Yet you balanced an eel on the end of your nose--
+What made you so awfully clever?'
+
+`I have answered three questions, and that is enough,'
+Said his father; `don't give yourself airs!
+Do you think I can listen all day to such stuff?
+Be off, or I'll kick you down stairs!'
+
+End
+
+End
+
+End
+Message: 5
+From: Sergey Poznyakoff <[email protected]>
+Subject: Empty MIME Parts
+Number of parts in message - 2
+Total message size - 913/27
+Type of part 1 = text/plain
+Message part size - 143/4: 143/4, 0/0
+Text Message
+Begin
+
+End
+Type of part 2 = text/plain
+Message part size - 156/5: 155/4, 1/1
+Text Message
+Begin
+
+
+End
+])
+
+AT_CLEANUP
diff --git a/testsuite/mimetest.c b/testsuite/mimetest.c
new file mode 100644
index 0000000..581eae7
--- /dev/null
+++ b/testsuite/mimetest.c
@@ -0,0 +1,296 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 1999, 2000, 2001, 2005, 2007, 2009, 2010 Free Software
+   Foundation, Inc.
+
+   GNU Mailutils is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   GNU Mailutils is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Mailutils; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301 USA */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+
+#include <mailutils/mailutils.h>
+
+void message_display_parts(mu_message_t msg, int indent);
+
+const char *from;
+const char *subject;
+const char *charset;
+int print_attachments;
+int indent_level = 4;
+
+void
+print_file (const char *fname, int indent)
+{
+  char buf[128];
+  FILE *fp = fopen (fname, "r");
+
+  if (!fp)
+    {
+      fprintf (stderr, "can't open file %s: %s", fname, strerror (errno));
+      return;
+    }
+
+  while (fgets (buf, sizeof buf, fp))
+    printf ("%*.*s%s", indent, indent, "", buf);
+  fclose (fp);
+  unlink (fname);
+}
+
+int
+main (int argc, char **argv)
+{
+  mu_mailbox_t mbox = NULL;
+  size_t i;
+  size_t count = 0;
+  char *mailbox_name;
+  int debug = 0;
+
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], "-d") == 0)
+        debug = 1;
+      else if (strcmp (argv[i], "-p") == 0)
+        print_attachments = 1;
+      else if (strcmp (argv[i], "-i") == 0)
+	{
+	  if (++i == argc)
+	    {
+	      mu_error ("-i requires argument");
+	      exit (1);
+	    }
+	  indent_level = strtoul (argv[i], NULL, 0);
+	}
+      else if (strcmp (argv[i], "-c") == 0)
+	{
+	  if (++i == argc)
+	    {
+	      mu_error ("-c requires argument");
+	      exit (1);
+	    }
+	  charset = argv[i];
+	}
+      else
+        break;
+    }
+
+  mailbox_name = argv[i];
+
+  /* Registration.  */
+  mu_registrar_record (mu_imap_record);
+  mu_registrar_record (mu_pop_record);
+  mu_registrar_record (mu_mbox_record);
+  mu_registrar_set_default_record (mu_mbox_record);
+
+  MU_ASSERT (mu_mailbox_create_default (&mbox, mailbox_name));
+  
+  /* Debugging trace. */
+  if (debug)
+    {
+      mu_debug_t debug;
+      mu_mailbox_get_debug (mbox, &debug);
+      mu_debug_set_level (debug, MU_DEBUG_LEVEL_UPTO (MU_DEBUG_PROT));
+    }
+
+  /* Open the mailbox for reading only.  */
+  MU_ASSERT (mu_mailbox_open (mbox, MU_STREAM_READ));
+
+  /* Iterate through the entire message set.  */
+  MU_ASSERT (mu_mailbox_messages_count (mbox, &count));
+
+  for (i = 1; i <= count; ++i)
+    {
+      mu_message_t msg;
+      mu_header_t hdr;
+      size_t nparts;
+      size_t msize, nlines;
+
+      MU_ASSERT (mu_mailbox_get_message (mbox, i, &msg));
+      MU_ASSERT (mu_message_size (msg, &msize));
+      MU_ASSERT (mu_message_lines (msg, &nlines));
+      MU_ASSERT (mu_message_get_header (msg, &hdr));
+      if (mu_header_sget_value (hdr, MU_HEADER_FROM, &from))
+	from = "";
+      if (mu_header_sget_value (hdr, MU_HEADER_SUBJECT, &subject))
+	subject = "";
+      printf ("Message: %lu\n", (unsigned long) i);
+      printf ("From: %s\n", from);
+      printf ("Subject: %s\n", subject);
+
+      MU_ASSERT (mu_message_get_num_parts (msg, &nparts));
+      printf ("Number of parts in message - %lu\n",
+	      (unsigned long) nparts);
+      printf ("Total message size - %lu/%lu\n",
+	      (unsigned long) msize, (unsigned long) nlines);
+      message_display_parts (msg, 0);
+    }
+  mu_mailbox_close (mbox);
+  mu_mailbox_destroy (&mbox);
+  return 0;
+}
+
+char buf[2048];
+
+static void
+print_message_part_sizes (mu_message_t part, int indent)
+{
+  mu_body_t body;
+  mu_header_t hdr;
+  size_t msize, mlines, hsize, hlines, bsize, blines;
+  
+  MU_ASSERT (mu_message_size (part, &msize));
+  MU_ASSERT (mu_message_lines (part, &mlines));
+  MU_ASSERT (mu_message_get_header (part, &hdr));
+  MU_ASSERT (mu_header_size (hdr, &hsize));
+  MU_ASSERT (mu_header_lines (hdr, &hlines));
+  MU_ASSERT (mu_message_get_body (part, &body));
+  MU_ASSERT (mu_body_size (body, &bsize));
+  MU_ASSERT (mu_body_lines (body, &blines));
+  printf ("%*.*sMessage part size - %lu/%lu: %lu/%lu, %lu/%lu\n",
+	  indent, indent, "",
+	  (unsigned long) msize, (unsigned long) mlines,
+	  (unsigned long) hsize, (unsigned long) hlines,
+	  (unsigned long) bsize, (unsigned long) blines);
+}
+  
+void
+message_display_parts (mu_message_t msg, int indent)
+{
+  int ret, j;
+  size_t nparts;
+  mu_message_t part;
+  mu_header_t hdr;
+  mu_stream_t str;
+  mu_body_t body;
+  int ismulti;
+  size_t nbytes;
+
+  /* How many parts does the message has? */
+  if ((ret = mu_message_get_num_parts (msg, &nparts)) != 0)
+    {
+      fprintf (stderr, "mu_message_get_num_parts - %s\n", mu_strerror (ret));
+      exit (2);
+    }
+
+  /* Iterate through all the parts.
+     Treat type "message/rfc822" differently, since it is a message of
+     its own that can have other subparts(recursive). */
+  for (j = 1; j <= nparts; j++)
+    {
+      int status;
+      const char *hvalue;
+      char *type = NULL;
+      const char *encoding = "";
+
+      MU_ASSERT (mu_message_get_part (msg, j, &part));
+      MU_ASSERT (mu_message_get_header (part, &hdr));
+      status = mu_header_sget_value (hdr, MU_HEADER_CONTENT_TYPE,
+				     &hvalue);
+      if (status == MU_ERR_NOENT)
+	/* nothing */;
+      else if (status != 0)
+	mu_error ("Cannot get header value: %s", mu_strerror (status));
+      else
+	{
+	  status = mu_mimehdr_aget_disp (hvalue, &type);
+	  if (status)
+	    mu_error ("Cannot extract content type field: %s",
+		      mu_strerror (status));
+	}
+      printf ("%*.*sType of part %d = %s\n", indent, indent, "",
+	      j, type ? type : "");
+      print_message_part_sizes (part, indent);
+      if (mu_header_sget_value (hdr, MU_HEADER_CONTENT_TRANSFER_ENCODING,
+				&encoding))
+	encoding = "";
+      ismulti = 0;
+      if ((type
+           && mu_c_strcasecmp (type, "message/rfc822") == 0)
+          || (mu_message_is_multipart (part, &ismulti) == 0 && ismulti))
+        {
+          if (!ismulti)
+	    MU_ASSERT (mu_message_unencapsulate (part, &part, NULL));
+	  
+          MU_ASSERT (mu_message_get_header (part, &hdr));
+          if (mu_header_sget_value (hdr, MU_HEADER_FROM, &from))
+	    from = "";
+          if (mu_header_sget_value (hdr, MU_HEADER_SUBJECT, &subject))
+	    subject = "";
+          printf ("%*.*sEncapsulated message : %s\t%s\n",
+                  indent, indent, "", from, subject);
+          printf ("%*.*sBegin\n", indent, indent, "");
+          message_display_parts (part, indent + indent_level);
+          mu_message_destroy (&part, NULL);
+        }
+      else if (!type
+               || (mu_c_strcasecmp (type, "text/plain") == 0)
+               || (mu_c_strcasecmp (type, "text/html")) == 0)
+	{
+	  printf ("%*.*sText Message\n", indent, indent, "");
+          printf ("%*.*sBegin\n", indent, indent, "");
+          mu_message_get_body (part, &body);
+          mu_body_get_streamref (body, &str);
+          /* Make sure the original body stream is not closed when
+             str gets destroyed */
+          mu_filter_create (&str, str, encoding, MU_FILTER_DECODE,
+			    MU_STREAM_READ);
+	  
+	  while (mu_stream_readline (str, buf, sizeof (buf), &nbytes) == 0
+		 && nbytes)
+            {
+              printf ("%*.*s%s", indent, indent, "", buf);
+            }
+          mu_stream_destroy (&str);
+        }
+      else
+        {
+          /* Save the attachements.  */
+          char *fname = NULL;
+
+          mu_message_aget_decoded_attachment_name (part, charset,
+						   &fname, NULL);
+          if (fname == NULL)
+            fname = mu_tempname (NULL);
+
+          printf ("%*.*sAttachment - saving [%s]\n", indent, indent, "",
+                  fname);
+          printf ("%*.*sBegin\n", indent, indent, "");
+          if (charset)
+	    {
+	      mu_mime_io_buffer_t info;
+	      mu_mime_io_buffer_create (&info);
+	      mu_mime_io_buffer_set_charset (info, charset);
+	      MU_ASSERT (mu_message_save_attachment (part, NULL, info));
+	      mu_mime_io_buffer_destroy (&info);
+	    }
+	  else
+	    MU_ASSERT (mu_message_save_attachment (part, fname, NULL));
+          if (print_attachments)
+            print_file (fname, indent);
+          free (fname);
+        }
+      printf ("\n%*.*sEnd\n", indent, indent, "");
+      free (type);
+    }
+}
+
diff --git a/testsuite/testsuite.at b/testsuite/testsuite.at
new file mode 100644
index 0000000..e9dde07
--- /dev/null
+++ b/testsuite/testsuite.at
@@ -0,0 +1,23 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+# This file is part of Mailfromd testsuite. 
+
+m4_include([testsuite.inc])
+
+AT_INIT
+
+m4_include([mime.at])
+m4_include([mbdel.at])
\ No newline at end of file


hooks/post-receive
-- 
GNU Mailutils
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.