r2341 - in packages/libmail-box-perl/branches/upstream/current: . lib/Mail lib/Mail/Box lib/Mail/Box/Dbx lib/Mail/Box/Dir lib/Mail/Box/File lib/Mail/Box/IMAP4 lib/Mail/Box/Locker lib/Mail/Box/MH lib/Mail/Box/Maildir lib/Mail/Box/Manage lib/Mail/Box/Mbox lib/Mail/Box/Message lib/Mail/Box/Net lib/Mail/Box/POP3 lib/Mail/Box/Parser lib/Mail/Box/Search lib/Mail/Box/Thread lib/Mail/Box/Tie lib/Mail/Message lib/Mail/Message/Body lib/Mail/Message/Construct lib/Mail/Message/Convert lib/Mail/Message/Field lib/Mail/Message/Head lib/Mail/Message/Replace lib/Mail/Message/TransferEnc lib/Mail/Message/Wrapper lib/Mail/Server lib/Mail/Server/IMAP4 lib/Mail/Transport tests/13body tests/14fieldu tests/20pparser tests/30encode tests/41mh tests/50message tests/60imap tests/80msgconv

Krzysztof Krzyzaniak eloy at costa.debian.org
Tue Mar 14 13:09:21 UTC 2006


Author: eloy
Date: 2006-03-14 13:08:21 +0000 (Tue, 14 Mar 2006)
New Revision: 2341

Modified:
   packages/libmail-box-perl/branches/upstream/current/ChangeLog
   packages/libmail-box-perl/branches/upstream/current/MANIFEST
   packages/libmail-box-perl/branches/upstream/current/META.yml
   packages/libmail-box-perl/branches/upstream/current/README.todo
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Cookbook.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Index.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Overview.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pod
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pm
   packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pod
   packages/libmail-box-perl/branches/upstream/current/tests/13body/40multip.t
   packages/libmail-box-perl/branches/upstream/current/tests/14fieldu/10full.t
   packages/libmail-box-perl/branches/upstream/current/tests/20pparser/34bodymp.t
   packages/libmail-box-perl/branches/upstream/current/tests/20pparser/50nested.t
   packages/libmail-box-perl/branches/upstream/current/tests/30encode/90body.t
   packages/libmail-box-perl/branches/upstream/current/tests/41mh/20write.t
   packages/libmail-box-perl/branches/upstream/current/tests/41mh/30append.t
   packages/libmail-box-perl/branches/upstream/current/tests/50message/30bounce.t
   packages/libmail-box-perl/branches/upstream/current/tests/50message/41forward.t
   packages/libmail-box-perl/branches/upstream/current/tests/60imap/10fetch.t
   packages/libmail-box-perl/branches/upstream/current/tests/80msgconv/20mimeent.t
Log:
Load /tmp/tmp.2O7lfn/libmail-box-perl-2.064 into
packages/libmail-box-perl/branches/upstream/current.


Modified: packages/libmail-box-perl/branches/upstream/current/ChangeLog
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/ChangeLog	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/ChangeLog	2006-03-14 13:08:21 UTC (rev 2341)
@@ -7,6 +7,34 @@
       usually limited to areas which are under development.  Mail::Box
       is a huge module, so there is always a lot of activity.
 
+version 2.064: Tue Feb 28 12:39:57 CET 2006
+
+	Fixes:
+
+	- redesigned everything what has to do with Content-Length and
+	  Lines.
+	  - now only added for Mbox folders
+	  - only for the whole message, not for each part in multipart
+
+	- corrected behavior of boundaries in multiparts to be
+	  compliant with the RFCs.  Parts without trailing newline
+	  are now correctly supported.  Thanks to [John Gardiner Myers]
+	  for the initial patch.
+
+	- $msg->moveTo called wrong copyTo.  Fixed by [Ken Guyton]
+
+	- use pragma "filetest 'access'", to support ACL environments.
+	  Reported via Debian by Rainer Schöpf.
+
+	- MH index files didn't work.  Multiple fixes, including some
+	  around append() to MH folders.  Reported by [Simon von Janowsky]
+
+	- Fixed infinit loop encoding lines in Mail::Message::Field::Full
+	  [Tuomas Salo]
+
+	- Mail::Message::Field::Full::encode lines could become 2 chars
+	  too long: RFC says 76 max.
+
 version 2.063: Tue Nov 1 09:13:14 CET 2005
 
 	Fixes:
@@ -104,6 +132,12 @@
 	- Mail::Transport::POP3 did only try APOP in AUTO mode. Found
 	  by [Markus Spann].
 
+	- $msg->send didn't pass the options correctly to the sending
+	  object. Reported by [Franck Richard].
+
+	- Mail::Transport::POP3 did only try APOP in AUTO mode. Found
+	  by [Markus Spann].
+
 	- scripts/mailbox2html used setLabel(), which got replaced by
 	  label() a long time ago. Reported by [Alain Veylit]
 
@@ -2724,9 +2758,3 @@
         * Many more test, a few example files, Mail::Box-Overview and
           Mail::Box-Cookbook.
 
-Before this, we had Mail::Box-1.xyz which also has a Changelog.  Most of
-that information is not really useful because version >=2.0 is a really,
-really major change, although there is strike for compibility.
-
-However, some of the bugfixes contributed for Mail::Box v1 are
-still present in Mail::Box v2.

Modified: packages/libmail-box-perl/branches/upstream/current/MANIFEST
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/MANIFEST	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/MANIFEST	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,6 +2,7 @@
 INSTALL
 LICENSE
 MANIFEST
+META.yml                                 Module meta-data (added by MakeMaker)
 Makefile.PL
 README
 README.FAQ
@@ -387,4 +388,3 @@
 tests/Tools.pm
 tests/folders/mbox.cpy
 tests/folders/mbox.src
-META.yml                                 Module meta-data (added by MakeMaker)

Modified: packages/libmail-box-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/META.yml	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/META.yml	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Mail-Box
-version:      2.063
+version:      2.064
 version_from: lib/Mail/Box.pm
 installdirs:  site
 requires:

Modified: packages/libmail-box-perl/branches/upstream/current/README.todo
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/README.todo	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/README.todo	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,13 +2,10 @@
 TODO:
 
 This program was originally written in December 2000.  Then a total
-redesign was made, which was released in December 2001.  Hence this module
-is quite recent, so please check for a new version: new programs often
-get many changes in their first months.
+redesign was made, which was released in December 2001.
 
-The file TODO.v2 lists lacks of the current implementation, which must
-be resolved to declare the implementation as beta.  In this file, more
-long-term plans are listed.
+The file TODO.v2 lists holes in the current implementation. In this file,
+more long-term plans are listed.
 
 Plans for the (near?) future:
 * Thread lint
@@ -33,8 +30,6 @@
   I have a long wishlist of older-types.  However, my knowledge on how
   they work is limited.  Furthermore, I do not have test-data on them.
 
-  - Exmh      (should be relatively simple, extends MH)
-  - IMAP      (using Mail::IMAPClient, looks not that hard)
   - Emaul     (? for compatibly with Mail::Folder)
   - News      NNTP
   - Outlook   writting... (reading is already available in ::Dbx)
@@ -48,16 +43,6 @@
   One of the main reasons that these are not implemented, is that my
   knowledge on how they work is insufficient.
 
-* Make more autoloading (of perl-code, this time).
-  Mail::Box::MH, ::Mbox, could be made autoloading....
-  however, I didn't make work it yet.  All modules are designed to
-  minimize their dependency, so I should work well.
-
-  For the message-folders, only foundIn() should be kept outside the
-  loading mechanism.
-
-* Kill a message which is used to free-up memory in large folders.
-
 * Maildir quota
 
 * Cooperation with OpenPGP

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Collection;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base qw/User::Identity::Collection Mail::Reporter/;
 
 use Mail::Box::Identity;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Collection.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -443,7 +443,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::Dbx::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::File::Message';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -285,6 +285,14 @@
 
 =back
 
+$obj-E<gt>B<escapedBody>
+
+=over 4
+
+See L<Mail::Box::File::Message/"The message">
+
+=back
+
 $obj-E<gt>B<folder>([FOLDER])
 
 =over 4
@@ -1014,7 +1022,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Dbx;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::File';
 
 use Mail::Box::Dbx::Message;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dbx.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -925,7 +925,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::Dir::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Message';
 
 use File::Copy qw/move/;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1036,7 +1036,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,11 +1,12 @@
 
-use strict;
 package Mail::Box::Dir;
 use vars '$VERSION';
-$VERSION = '2.063';
-
+$VERSION = '2.064';
 use base 'Mail::Box';
 
+use strict;
+use filetest 'access';
+
 use Mail::Box::Dir::Message;
 
 use Mail::Message::Body::Lines;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Dir.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -824,7 +824,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,6 +1,6 @@
 package Mail::Box::FastScalar;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/FastScalar.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -37,7 +37,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,11 +2,10 @@
 use strict;
 package Mail::Box::File::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Message';
 
-use POSIX 'SEEK_SET';
-use Carp;
+use List::Util   qw/sum/;
 
 
 sub init($)
@@ -34,9 +33,17 @@
 {   my $self  = shift;
     my $out   = shift || select;
 
+    my $escaped = $self->escapedBody;
     $out->print($self->fromLine);
-    $self->head->print($out);
-    $self->body->printEscapedFrom($out);
+
+    my $size  = sum map {length($_)} @$escaped;
+
+    my $head  = $self->head;
+    $head->set('Content-Length' => $size); 
+    $head->set('Lines' => scalar @$escaped);
+    $head->print($out);
+
+    $out->print($_) for @$escaped;
     $out->print("\n");
     $self;
 }
@@ -63,6 +70,15 @@
 #------------------------------------------
 
 
+sub escapedBody()
+{   my @lines = shift->body->lines;
+    s/^(\>*From )/>$1/ for @lines;
+    \@lines;
+}
+
+#------------------------------------------
+
+
 sub readFromParser($)
 {   my ($self, $parser) = @_;
     my ($start, $fromline)  = $parser->readSeparator;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -257,6 +257,19 @@
 
 =back
 
+$obj-E<gt>B<escapedBody>
+
+=over 4
+
+Mbox folders contain multiple messages in one file, using a separator
+line to keep them apart.  Typically, these lines start with "From ".
+Lines within the message could interfere with this separator, and should
+therefore be translated.
+
+This method will return the escaped text of the body as reference.
+
+=back
+
 $obj-E<gt>B<folder>([FOLDER])
 
 =over 4
@@ -977,7 +990,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,10 +1,12 @@
 
-use strict;
 package Mail::Box::File;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box';
 
+use strict;
+use filetest 'access';
+
 use Mail::Box::File::Message;
 
 use Mail::Message::Body::Lines;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/File.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1033,7 +1033,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::IMAP4::Head;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head';
 
 use Date::Parse;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Head.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -403,7 +403,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::IMAP4::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Net::Message';
 
 use Date::Parse 'str2time';

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1060,7 +1060,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::IMAP4;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Net';
 
 use Mail::Box::IMAP4::Message;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/IMAP4.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1015,7 +1015,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Identity;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base qw/User::Identity::Item Mail::Reporter/;
 
 use Mail::Box::Collection;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Identity.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -605,7 +605,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Locker::DotLock;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Locker';
 
 use IO::File;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/DotLock.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -274,7 +274,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Locker::Flock;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Locker';
 
 use IO::File;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Flock.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -285,7 +285,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Locker::Multi;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Locker';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/Multi.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -298,7 +298,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Locker::NFS;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Locker';
 
 use Sys::Hostname;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/NFS.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -281,7 +281,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Locker::POSIX;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Locker';
 
 use POSIX;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker/POSIX.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -282,7 +282,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Locker;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Locker.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -416,7 +416,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,11 +1,12 @@
 
-use strict;
-
 package Mail::Box::MH::Index;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
+use strict;
+use warnings;
+
 use Mail::Message::Head::Subset;
 use Carp;
 
@@ -36,9 +37,8 @@
 
 
 sub write(@)
-{   my $self      = shift;
-    my $index     = $self->filename or return $self;
-    my $fieldtype = 'Mail::Message::Field';
+{   my $self  = shift;
+    my $index = $self->filename or return $self;
 
     # Remove empty index-file.
     unless(@_)
@@ -46,25 +46,28 @@
         return $self;
     }
 
+    local *INDEX;
+    open INDEX, '>', $index
+        or return $self;
+
+    my $fieldtype = 'Mail::Message::Field';
     my $written    = 0;
 
-    local *INDEX;
-    open INDEX, '>', $index or return;
-
     foreach my $msg (@_)
     {   my $head     = $msg->head;
-        next if $head->isDelayed;
+        next if $head->isDelayed && $head->isa('Mail::Message::Head::Subset');
 
         my $filename = $msg->filename;
-        $head->setNoRealize($fieldtype->new('X-MailBox-Filename' => $filename));
-        $head->setNoRealize($fieldtype->new('X-MailBox-Size'  => -s $filename));
+        print INDEX "X-MailBox-Filename: $filename\n"
+                  , 'X-MailBox-Size: ', (-s $filename), "\n";
+
         $head->print(\*INDEX);
         $written++;
     }
 
     close INDEX;
 
-    unlink $index unless $written;
+    $written or unlink $index;
 
     $self;
 }
@@ -72,6 +75,34 @@
 #-------------------------------------------
 
 
+sub append(@)
+{   my $self      = shift;
+    my $index     = $self->filename or return $self;
+
+    local *INDEX;
+    open INDEX, '>>', $index
+        or return $self;
+
+    my $fieldtype = 'Mail::Message::Field';
+
+    foreach my $msg (@_)
+    {   my $head     = $msg->head;
+        next if $head->isDelayed && $head->isa('Mail::Message::Head::Subset');
+
+        my $filename = $msg->filename;
+        print INDEX "X-MailBox-Filename: $filename\n"
+                  , 'X-MailBox-Size: ', (-s $filename), "\n";
+
+        $head->print(\*INDEX);
+    }
+
+    close INDEX;
+    $self;
+}
+
+#-------------------------------------------
+
+
 sub read(;$)
 {   my $self     = shift;
     my $filename = $self->{MBMI_filename};
@@ -92,7 +123,7 @@
         my $msgfile = $head->get('x-mailbox-filename');
         my $size    = int $head->get('x-mailbox-size');
         next unless -f $msgfile && -s _ == $size;
-        next if defined $index_age && -M _ >= $index_age;
+        next if defined $index_age && -M _ < $index_age;
 
         # keep this one
         $index{$msgfile} = $head;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Index.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -92,6 +92,14 @@
 =head2 The Index
 
 
+$obj-E<gt>B<append>(MESSAGES)
+
+=over 4
+
+Append MESSAGES to the index file.
+
+=back
+
 $obj-E<gt>B<filename>
 
 =over 4
@@ -117,7 +125,7 @@
 =over 4
 
 Read the index file.  The header objects can after this be requested
-with the get() method.
+with the L<get()|Mail::Box::MH::Index/"The Index"> method.
 
 =back
 
@@ -126,7 +134,7 @@
 =over 4
 
 Write an index file containing the headers specified MESSAGES
-(Mail::Message objects).
+(L<Mail::Message|Mail::Message> objects).
 
 =back
 
@@ -277,7 +285,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::MH::Labels;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Mail::Message::Head::Subset;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Labels.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -259,7 +259,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::MH::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Dir::Message';
 
 use File::Copy;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -982,7 +982,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,10 +1,12 @@
 
-use strict;
 package Mail::Box::MH;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Dir';
 
+use strict;
+use filetest 'access';
+
 use Mail::Box::MH::Index;
 use Mail::Box::MH::Message;
 use Mail::Box::MH::Labels;
@@ -208,7 +210,7 @@
                  : exists $args{messages} ? @{$args{messages}}
                  : return ();
 
-    my $self     = $class->new(@_, access => 'a')
+    my $self     = $class->new(@_, access => 'r')
         or return ();
 
     my $directory= $self->directory;
@@ -231,10 +233,11 @@
         $msgnr++;
     }
  
-    my $labels   = $self->labels->append(@messages);
+    $self->labels->append(@messages);
+    $self->index->append(@messages);
 
     $locker->unlock;
-    $self->close;
+    $self->close(write => 'NEVER');
 
     @messages;
 }
@@ -282,7 +285,7 @@
     $self->{MBM_labels} = $self->{MBM_labels_type}->new
       ( filename => $self->{MBM_labels_filename}
       , $self->logSettings
-      )
+      );
 }
 
 #-------------------------------------------

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/MH.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -974,7 +974,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::Maildir::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Dir::Message';
 
 use File::Copy;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1026,7 +1026,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,10 +1,12 @@
 
-use strict;
 package Mail::Box::Maildir;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Dir';
 
+use strict;
+use filetest 'access';
+
 use Mail::Box::Maildir::Message;
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Maildir.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -883,7 +883,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::Manage::User;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Manager';
 
 use Mail::Box::Collection     ();

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manage/User.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -642,7 +642,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Manager;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Mail::Box;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Manager.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -796,7 +796,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Mbox::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::File::Message';
 
 
@@ -38,5 +38,4 @@
 
 #------------------------------------------
 
-
 1;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -199,6 +199,14 @@
 
 =back
 
+$obj-E<gt>B<escapedBody>
+
+=over 4
+
+See L<Mail::Box::File::Message/"The message">
+
+=back
+
 $obj-E<gt>B<folder>([FOLDER])
 
 =over 4
@@ -902,7 +910,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,10 +1,12 @@
 
-use strict;
 package Mail::Box::Mbox;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::File';
 
+use strict;
+use filetest 'access';
+
 use Mail::Box::Mbox::Message;
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Mbox.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -933,7 +933,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Message::Destructed;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Message';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message/Destructed.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -962,7 +962,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message';
 
 use Date::Parse;
@@ -93,7 +93,7 @@
     $args{share} = 1
         unless exists $args{share} || exists $args{shallow_body};
 
-    my $added = $folder->copyTo($folder, %args);
+    my $added = $self->copyTo($folder, %args);
     $self->label(deleted => 1);
     $added;
 }

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1046,7 +1046,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::Net::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Message';
 
 use File::Copy;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -945,7 +945,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Net;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use base 'Mail::Box';
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Net.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -805,7 +805,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box::POP3::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Net::Message';
 
 use File::Copy;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -940,7 +940,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Box::POP3;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Net';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/POP3.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -923,7 +923,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Parser::Perl;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Parser';
 
 use Mail::Message::Field;
@@ -46,7 +46,7 @@
     @_ ? $self->{MBPP_file}->seek(shift, 0) : $self->{MBPP_file}->tell;
 }
 
-my $empty = qr/^[\015\012]*$/;
+my $empty = qr/^[\015\012]*\z/;
 
 #------------------------------------------
 
@@ -69,7 +69,7 @@
                 "Unexpected end of header in ".$self->filename.":\n $line");
 
             if(@ret && $self->fixHeaderErrors)
-            {   $ret[-1][1] .= ' '.$line;  # glue erroneous line to previous field
+            {   $ret[-1][1] .= ' '.$line;  # glue err line to previous field
                 $line = $file->getline;
                 next LINE;
             }
@@ -156,64 +156,45 @@
     my $file    = $self->{MBPP_file};
     my $lines   = [];
 
-    if(@seps && $self->{MBPP_trusted})
-    {   my $sep  = $seps[0];
-        my $l    = length $sep;
-
-        while(1)
-        {   my $where = $file->tell;
-            my $line  = $file->getline or last;
-
-            if(   substr($line, 0, $l) eq $sep
-               && ($sep ne 'From ' || $line =~ m/ (?:19[789]\d|20[01]\d)/)
-               )
-            {   $file->seek($where, 0);
-                last;
-            }
-
-            push @$lines, $line;
-        }
-    }
-    elsif(@seps)
+    if(@seps)
     {   
-
-  LINE: while(1)
+       LINE:
+        while(1)
         {   my $where = $file->getpos;
-            my $line  = $file->getline or last;
+            my $line  = $file->getline
+                or last LINE;
 
             foreach my $sep (@seps)
             {   next if substr($line, 0, length $sep) ne $sep;
-                next if $sep eq 'From ' && $line !~ m/ (?:19[789]\d|20[01]\d)/;
+                next if $sep eq 'From ' && $line !~ m/ 19[789]\d| 20[012]\d/;
 
                 $file->setpos($where);
+
+                if($sep =~ m/^--/)  # consume \n before boundary
+                {   if(@$lines && $lines->[-1] =~ s/(\r?\n)\z//)
+                    {   $file->seek(-length($1), 1);
+                        pop @$lines if length($lines->[-1])==0;
+                    }
+                }
                 last LINE;
             }
 
-            $line =~ s/\015$//;
             push @$lines, $line;
         }
     }
     else # File without separators.
-    {   $lines = ref $file eq 'Mail::Box::FastScalar' ? $file->getlines : [ $file->getlines ];
+    {   $lines = ref $file eq 'Mail::Box::FastScalar'
+               ? $file->getlines : [ $file->getlines ];
     }
 
     my $end = $file->tell;
-    if($exp_lines > 0 )
-    {    while(@$lines > $exp_lines && $lines->[-1] =~ $empty)
-         {   $end -= length $lines->[-1];
-             pop @$lines;
-         }
-    }
-    elsif(@seps && @$lines && $lines->[-1] =~ $empty)
-    {   # blank line should be in place before a separator.  Only that
-        # line is removed.
-        $end -= length $lines->[-1];
-        pop @$lines;
-    }
 
-    map { s/^\>(\>*From\s)/$1/ } @$lines
-        if $self->{MBPP_strip_gt};
-
+    if($self->{MBPP_strip_gt})
+    {   map { s/^\>(\>*From\s)/$1/ } @$lines;
+        pop @$lines if @$lines && $lines->[-1] eq "\n";
+    }
+  
+    unless($self->{MBPP_trusted}) { s/\015$// for @$lines }
     $end, $lines;
 }
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser/Perl.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -423,7 +423,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Box::Parser;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 use Carp;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Parser.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -509,7 +509,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Box::Search::Grep;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Search';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/Grep.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -366,7 +366,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Box::Search::SpamAssassin;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Search';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search/SpamAssassin.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -354,7 +354,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Box::Search;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Search.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -436,7 +436,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Thread::Manager;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Manager.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -568,7 +568,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Thread::Node;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Thread/Node.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -530,7 +530,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Tie::ARRAY;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Carp;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/ARRAY.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -180,7 +180,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 use strict;
 package Mail::Box::Tie::HASH;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Carp;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie/HASH.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -170,7 +170,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Box::Tie;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use strict;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box/Tie.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -51,7 +51,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Cookbook.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Cookbook.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Cookbook.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -271,7 +271,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Index.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Index.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Index.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -269,7 +269,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Overview.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Overview.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box-Overview.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -319,7 +319,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Box;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Mail::Box::Message;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Box.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1911,7 +1911,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -5,7 +5,7 @@
 
 package Mail::Message::Body;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Carp;
 use Mail::Message::Body::String;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Construct.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -181,7 +181,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body::Delayed;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Object::Realize::Later

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Delayed.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -318,7 +318,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::Body;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Encode.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -237,7 +237,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body::File;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Body';
 
 use Mail::Box::Parser;
@@ -224,36 +224,6 @@
 
 #------------------------------------------
 
-sub printEscapedFrom($)
-{   my ($self, $fh) = @_;
-    my $file = $self->tempFilename;
-
-    local $_;
-    local *IN;
-
-    open IN, '<', $file
-        or croak "Cannot read from $file: $!\n";
-
-    if(ref $fh eq 'GLOB')
-    {   while( <IN> )
-        {   s/^(?=\>*From )/>/;
-            print $fh;
-        }
-    }
-    else
-    {   while( <IN> )
-        {   s/^(?=\>*From )/>/;
-            $fh->print($_);
-        }
-    }
-
-    close IN;
-
-    $self;
-}
-
-#------------------------------------------
-
 sub read($$;$@)
 {   my ($self, $parser, $head, $bodytype) = splice @_, 0, 4;
     my $file = $self->tempFilename;
@@ -272,7 +242,13 @@
 
 #------------------------------------------
 
+# on UNIX always true.  Expensive to calculate on Windows: message size
+# may be off-by-one in rare cases.
+sub endsOnNewline() { shift->size==0 }
 
+#------------------------------------------
+
+
 sub tempFilename(;$)
 {   my $self = shift;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/File.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -346,6 +346,14 @@
 =head2 Access to the payload
 
 
+$obj-E<gt>B<endsOnNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<file>
 
 =over 4
@@ -386,6 +394,14 @@
 
 =back
 
+$obj-E<gt>B<stripTrailingNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<write>(OPTIONS)
 
 =over 4
@@ -659,7 +675,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body::Lines;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Body';
 
 use Mail::Box::Parser;
@@ -80,7 +80,7 @@
 
 #------------------------------------------
 
-sub lines()  { wantarray ? @{shift->{MMBL_array}} : shift->{MMBL_array} }
+sub lines() { wantarray ? @{shift->{MMBL_array}} : shift->{MMBL_array} }
 
 #------------------------------------------
 
@@ -98,27 +98,6 @@
 
 #------------------------------------------
 
-sub printEscapedFrom($)
-{   my ($self, $fh) = @_;
-
-    if(ref $fh eq 'GLOB')
-    {   foreach ( @{$self->{MMBL_array}} )
-        {   s/^(?=\>*From )/>/;
-            print $fh;
-        }
-    }
-    else
-    {   foreach ( @{$self->{MMBL_array}} )
-        {   s/^(?=\>*From )/>/;
-            $fh->print($_);
-        }
-    }
-
-    $self;
-}
-
-#------------------------------------------
-
 sub read($$;$@)
 {   my ($self, $parser, $head, $bodytype) = splice @_, 0, 4;
     my ($begin, $end, $lines) = $parser->bodyAsList(@_);
@@ -131,4 +110,11 @@
 
 #------------------------------------------
 
+sub endsOnNewline()
+{   my $last = shift->{MMBL_array}[-1];
+    !defined $last || $last =~ m/\n$/;
+}
+
+#------------------------------------------
+
 1;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Lines.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -347,6 +347,14 @@
 =head2 Access to the payload
 
 
+$obj-E<gt>B<endsOnNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<file>
 
 =over 4
@@ -387,6 +395,14 @@
 
 =back
 
+$obj-E<gt>B<stripTrailingNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<write>(OPTIONS)
 
 =over 4
@@ -645,7 +661,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body::Multipart;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Body';
 
 use Mail::Message::Body::Lines;
@@ -95,11 +95,19 @@
 #------------------------------------------
 
 sub nrLines()
-{   my $self   = shift;
-    my $nr     = 1;     # trailing boundary
+{   my $self = shift;
+    my $nr   = 1;     # trailing boundary
 
-    if(my $preamble = $self->preamble) { $nr += $preamble->nrLines }
-    $nr += 2 + $_->nrLines foreach $self->parts('ACTIVE');
+    if(my $preamble = $self->preamble)
+    {   $nr += $preamble->nrLines;
+        $nr++ if $preamble->endsOnNewline;
+    }
+
+    foreach my $part ($self->parts('ACTIVE'))
+    {   $nr += 1 + $part->nrLines;
+        $nr++ if $part->body->endsOnNewline;
+    }
+
     if(my $epilogue = $self->epilogue) { $nr += $epilogue->nrLines }
     $nr;
 }
@@ -108,12 +116,14 @@
 
 sub size()
 {   my $self   = shift;
-    my $bbytes = length($self->boundary) +3;
+    my $bbytes = length($self->boundary) +4;  # \n--$b\n
 
-    my $bytes  = 0;
-    if(my $preamble = $self->preamble) { $bytes += $preamble->size }
-    $bytes     += $bbytes + 2;  # last boundary
-    $bytes += $bbytes + 1 + $_->size foreach $self->parts('ACTIVE');
+    my $bytes  = $bbytes +2;   # last boundary, \n--$b--\n
+    if(my $preamble = $self->preamble)
+         { $bytes += $preamble->size }
+    else { $bytes -= 1 }      # no leading \n
+
+    $bytes += $bbytes + $_->size foreach $self->parts('ACTIVE');
     if(my $epilogue = $self->epilogue) { $bytes += $epilogue->size }
 
     $bytes;
@@ -134,9 +144,17 @@
     my $preamble = $self->preamble;
     push @lines, $preamble->lines if $preamble;
 
-    push @lines, "--$boundary\n", $_->lines
-        foreach $self->parts('ACTIVE');
+    foreach my $part ($self->parts('ACTIVE'))
+    {   # boundaries start with \n
+        if(!@lines) { ; }
+        elsif($lines[-1] =~ m/\n$/) { push @lines, "\n" }
+        else { $lines[-1] .= "\n" }
+        push @lines, "--$boundary\n", $part->lines;
+    }
 
+    if(!@lines) { ; }
+    elsif($lines[-1] =~ m/\n$/) { push @lines, "\n" }
+    else { $lines[-1] .= "\n" }
     push @lines, "--$boundary--\n";
 
     my $epilogue = $self->epilogue;
@@ -163,20 +181,28 @@
     my $out  = shift || select;
 
     my $boundary = $self->boundary;
-    if(my $preamble = $self->preamble) { $preamble->print($out) }
+    my $count    = 0;
+    if(my $preamble = $self->preamble)
+    {   $preamble->print($out);
+        $count++;
+    }
 
     if(ref $out eq 'GLOB')
     {   foreach my $part ($self->parts('ACTIVE'))
-        {   print $out "--$boundary\n";
+        {   print $out "\n" if $count++;
+            print $out "--$boundary\n";
             $part->print($out);
         }
+        print $out "\n" if $count++;
         print $out "--$boundary--\n";
     }
     else
     {   foreach my $part ($self->parts('ACTIVE'))
-        {   $out->print("--$boundary\n");
+        {   $out->print("\n") if $count++;
+            $out->print("--$boundary\n");
             $part->print($out);
         }
+        $out->print("\n") if $count++;
         $out->print("--$boundary--\n");
     }
 
@@ -187,36 +213,6 @@
 
 #------------------------------------------
 
-sub printEscapedFrom($)
-{   my ($self, $out) = @_;
-
-    my $boundary = $self->boundary;
-    if(my $preamble = $self->preamble) { $preamble->printEscapedFrom($out) }
-
-    if(ref $out eq 'GLOB')
-    {   foreach my $part ($self->parts('ACTIVE'))
-        {   print $out "--$boundary\n";
-            $part->printEscapedFrom($out);
-            print $out "\n";
-        }
-        print $out "--$boundary--\n";
-    }
-    else
-    {   foreach my $part ($self->parts('ACTIVE'))
-        {   $out->print("--$boundary\n");
-            $part->printEscapedFrom($out);
-            $out->print("\n");
-        }
-        $out->print("--$boundary--\n");
-    }
-
-    if(my $epilogue = $self->epilogue) { $epilogue->printEscapedFrom($out) }
-
-    $self;
-}
-
-#------------------------------------------
-
 sub check()
 {   my $self = shift;
     $self->foreachComponent( sub {$_[1]->check} );
@@ -258,7 +254,8 @@
     my $preamble = Mail::Message::Body::Lines->new(@msgopts, @sloppyopts)
        ->read($parser, $head);
 
-    $self->{MMBM_preamble} = $preamble if defined $preamble;
+    $self->{MMBM_preamble} = $preamble
+        if defined $preamble && $preamble->nrLines > 0;
 
     # Get the parts.
 
@@ -282,7 +279,9 @@
     my $epilogue = Mail::Message::Body::Lines->new(@msgopts, @sloppyopts)
         ->read($parser, $head);
 
-    $self->{MMBM_epilogue} = $epilogue if defined $epilogue;
+    $self->{MMBM_epilogue} = $epilogue
+        if defined $epilogue && $epilogue->nrLines > 0;
+
     my $end = defined $epilogue ? ($epilogue->fileLocation)[1]
             : @parts            ? ($parts[-1]->fileLocation)[1]
             : defined $preamble ? ($preamble->fileLocation)[1]
@@ -424,5 +423,9 @@
 
 #-------------------------------------------
 
+sub endsOnNewline() { 1 }
 
+#-------------------------------------------
+
+
 1;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Multipart.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -465,6 +465,14 @@
 
 =back
 
+$obj-E<gt>B<endsOnNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<epilogue>
 
 =over 4
@@ -565,6 +573,14 @@
 
 =back
 
+$obj-E<gt>B<stripTrailingNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<write>(OPTIONS)
 
 =over 4
@@ -828,7 +844,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body::Nested;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Body';
 
 use Mail::Message::Body::Lines;
@@ -88,11 +88,6 @@
 
 #------------------------------------------
 
-sub printEscapedFrom($)
-{   my $self = shift;
-    $self->nested->printEscapedFrom(shift);
-}
-
 sub check() { shift->forNested( sub {$_[1]->check} ) }
 
 #------------------------------------------
@@ -130,6 +125,10 @@
     );
 }
 
+#-------------------------------------------
+
+sub endsOnNewline() { shift->nested->body->endsOnNewline }
+
 #------------------------------------------
 
 sub moveLocation($)

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/Nested.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -373,6 +373,14 @@
 =head2 Access to the payload
 
 
+$obj-E<gt>B<endsOnNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<file>
 
 =over 4
@@ -431,6 +439,14 @@
 
 =back
 
+$obj-E<gt>B<stripTrailingNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<write>(OPTIONS)
 
 =over 4
@@ -684,7 +700,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body::String;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Body';
 
 use Carp;
@@ -72,19 +72,14 @@
 }
 
 #------------------------------------------
-# Only compute it once, if needed.  The scalar contains lines, so will
-# have a \n even at the end.
 
 sub nrLines()
 {   my $self = shift;
     return $self->{MMBS_nrlines} if defined $self->{MMBS_nrlines};
 
-    my $nrlines = 0;
-    for($self->{MMBS_scalar})
-    {   $nrlines++ while /\n/g;
-    }
-
-    $self->{MMBS_nrlines} = $nrlines;
+    my $lines = $self->{MMBS_scalar} =~ tr/\n/\n/;
+    $lines++ if $self->{MMBS_scalar} !~ m/\n\z/;
+    $self->{MMBS_nrlines} = $lines;
 }
 
 #------------------------------------------
@@ -118,18 +113,6 @@
 
 #------------------------------------------
 
-sub printEscapedFrom($)
-{   my ($self, $fh) = @_;
-
-    my $text = $self->{MMBS_scalar};    # copy required
-    $text    =~ s/^(?=\>*From )/>/;
-    if(ref $fh eq 'GLOB') { print $fh $text   }
-    else                  { $fh->print($text) }
-    $self;
-}
-
-#------------------------------------------
-
 sub read($$;$@)
 {   my ($self, $parser, $head, $bodytype) = splice @_, 0, 4;
     delete $self->{MMBS_nrlines};
@@ -142,4 +125,8 @@
 
 #------------------------------------------
 
+sub endsOnNewline() { shift->{MMBS_scalar} =~ m/\A\z|\n\z/ }
+
+#------------------------------------------
+
 1;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body/String.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -348,6 +348,14 @@
 =head2 Access to the payload
 
 
+$obj-E<gt>B<endsOnNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<file>
 
 =over 4
@@ -388,6 +396,14 @@
 
 =back
 
+$obj-E<gt>B<stripTrailingNewline>
+
+=over 4
+
+See L<Mail::Message::Body/"Access to the payload">
+
+=back
+
 $obj-E<gt>B<write>(OPTIONS)
 
 =over 4
@@ -646,7 +662,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Body;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Mail::Message::Field;
@@ -69,7 +69,7 @@
         elsif($file->isa('IO::Handle'))
         {    $self->_data_from_filehandle($file) or return }
         else
-        {    croak "Illegal datatype for file option." }
+        {    croak "message body: illegal datatype for file option" }
     }
     elsif(defined(my $data = $args->{data}))
     {
@@ -81,7 +81,7 @@
         {   $self->_data_from_lines($data) or return;
         }
         else
-        {   croak "Illegal datatype for data option." }
+        {   croak "message body: illegal datatype for data option" }
     }
     elsif(! $self->isMultipart && ! $self->isNested)
     {   # Neither 'file' nor 'data', so empty body.
@@ -366,6 +366,16 @@
 #------------------------------------------
 
 
+sub endsOnNewline() {shift->notImplemented}
+
+#------------------------------------------
+
+
+sub stripTrailingNewline() {shift->notImplemented}
+
+#------------------------------------------
+
+
 sub read(@) {shift->notImplemented}
 
 #------------------------------------------
@@ -380,9 +390,6 @@
     $size     += $lines if $Mail::Message::crlf_platform;
 
     $head->set($self->type);
-    $head->set('Content-Length' => $size);
-    $head->set(Lines            => $lines);
-
     $head->set($self->transferEncoding);
     $head->set($self->disposition);
     $head->set($self->description);

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Body.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -638,6 +638,16 @@
 =head2 Access to the payload
 
 
+$obj-E<gt>B<endsOnNewline>
+
+=over 4
+
+Returns whether the last line of the body is terminated by a new-line
+(in transport it will become a CRLF).  An empty body will return true
+as well: the newline comes from the line before it.
+
+=back
+
 $obj-E<gt>B<file>
 
 =over 4
@@ -717,6 +727,15 @@
 
 =back
 
+$obj-E<gt>B<stripTrailingNewline>
+
+=over 4
+
+Remove the newline from the last line, or the last line if it does not
+contain anything else than a newline.
+
+=back
+
 $obj-E<gt>B<write>(OPTIONS)
 
 =over 4
@@ -1114,7 +1133,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Message::Head::Complete;
 use Mail::Message::Field;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Bounce.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -83,7 +83,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Message::Head::Complete  ();
 use Mail::Message::Body::Lines     ();

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Build.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -335,7 +335,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Message::Body::Multipart;
 use Mail::Message::Body::Nested;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Forward.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -490,7 +490,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Box::FastScalar;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Read.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -109,7 +109,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Message::Head::Complete;
 use Mail::Message::Body::Lines;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Rebuild.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -296,7 +296,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Message::Body::Multipart;
 use Mail::Address;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Reply.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -304,7 +304,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use IO::Lines;
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct/Text.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -108,7 +108,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Mail::Message::Head::Complete;
 use Mail::Message::Body::Lines;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Construct.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -46,7 +46,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Convert::Html;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Convert';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/Html.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -307,7 +307,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Convert::HtmlFormatPS;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Convert';
 
 use Mail::Message::Body::String;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatPS.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -222,7 +222,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Convert::HtmlFormatText;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Convert';
 
 use Mail::Message::Body::String;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/HtmlFormatText.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -237,7 +237,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::Convert::MailInternet;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Convert';
 
 use Mail::Internet;
@@ -40,7 +40,7 @@
 
 
 my @pref_order = qw/From To Cc Subject Date In-Reply-To References
-    Content-Type Lines Content-Length/;
+    Content-Type/;
 
 sub from($@)
 {   my ($thing, $mi) = (shift, shift);

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MailInternet.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -241,7 +241,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::Convert::MimeEntity;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Convert';
 
 use MIME::Entity;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/MimeEntity.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -252,7 +252,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Convert::TextAutoformat;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Convert';
 
 use Mail::Message::Body::String;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert/TextAutoformat.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -227,7 +227,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::Convert;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Convert.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -266,7 +266,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Dummy;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Dummy.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -887,7 +887,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::AddrGroup;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'User::Identity::Collection::Emails';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/AddrGroup.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -333,7 +333,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Address;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Identity';
 
 use Mail::Message::Field::Addresses;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Address.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -332,7 +332,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Addresses;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field::Structured';
 
 use Mail::Message::Field::AddrGroup;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Addresses.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -798,7 +798,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Attribute;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 use 5.007003;
 use Encode ();

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Attribute.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -373,7 +373,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Fast;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Fast.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -587,7 +587,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Flex;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Flex.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -561,7 +561,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Full;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field';
 
 use utf8;
@@ -246,12 +246,12 @@
         $qp      =~ s#([_\?])#sprintf "=%02X", ord $1#ge;
         $qp      =~ s/ /_/g;
 
-        my $take = 72 - CORE::length($pre);
-        while(CORE::length($qp) > $take)
+        my $take = 70 - CORE::length($pre);
+        while(CORE::length($qp) > $take+1)
         {   $qp =~ s#^(.{$take}.?.?[^=][^=])## or warn $qp;
             $ready .= "$pre$1?= ";
         }
-        $ready .= "$pre$qp?=" if CORE::length $qp;
+        $ready .= "$pre$qp?=" if CORE::length($qp);
     }
 
     else

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Full.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -897,7 +897,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Structured;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field::Full';
 
 use Mail::Message::Field::Attribute;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Structured.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -764,7 +764,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -2,7 +2,7 @@
 
 package Mail::Message::Field::URIs;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field::Structured';
 use Carp 'confess';
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/URIs.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -742,7 +742,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field::Unstructured;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Field::Full';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field/Unstructured.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -686,7 +686,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Field;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Carp;
@@ -51,9 +51,8 @@
      Resent-Date Resent-From Resent-Sender Resent-To Return-Path
      List-Help List-Post List-Unsubscribe Mailing-List
      Received References Message-ID In-Reply-To
-     Content-Length Content-Type Content-Disposition
+     Content-Type Content-Disposition
      Delivered-To
-     Lines
      MIME-Version
      Precedence
      Status/;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Field.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1107,7 +1107,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Head::Complete;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head';
 
 use Mail::Box::Parser;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Complete.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -992,7 +992,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Head::Delayed;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head';
 
 use Object::Realize::Later

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Delayed.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -398,7 +398,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Message::Head::FieldGroup;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/FieldGroup.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -451,7 +451,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Message::Head::ListGroup;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head::FieldGroup';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ListGroup.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -522,7 +522,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Head::Partial;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head::Complete';
 
 use Scalar::Util 'weaken';

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Partial.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -752,7 +752,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Head::ResentGroup;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head::FieldGroup';
 
 use Scalar::Util 'weaken';

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/ResentGroup.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -641,7 +641,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1,7 +1,7 @@
 
 package Mail::Message::Head::SpamGroup;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head::FieldGroup';
 
 use strict;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/SpamGroup.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -529,7 +529,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Head::Subset;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head';
 
 use Object::Realize::Later
@@ -85,7 +85,7 @@
 #-------------------------------------------
 
 
-sub load() {$_[0] = $_[0]->message->loadHead}
+sub load() { $_[0] = $_[0]->message->loadHead }
 
 #------------------------------------------
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head/Subset.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -397,7 +397,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Head;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Mail::Message::Head::Complete;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Head.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -605,7 +605,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Part;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message';
 
 use Scalar::Util    'weaken';

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Part.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -919,7 +919,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::Replace::MailHeader;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::Head::Complete';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailHeader.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -881,7 +881,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::Replace::MailInternet;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message';
 
 use Mail::Box::FastScalar;
@@ -328,14 +328,12 @@
 
 
 sub as_mbox_string()
-{   my $self   = shift;
-    my $head   = $self->head->clone;
-    $head->delete('Content-Length');
+{   my $self    = shift;
+    my $mboxmsg = Mail::Box::Mbox->coerce($self);
 
-    my $buffer = '';
-    my $file   = Mail::Box::FastScalar->new(\$buffer);
-    $head->print($file);
-    $self->body->printEscapedFrom($file);
+    my $buffer  = '';
+    my $file    = Mail::Box::FastScalar->new(\$buffer);
+    $mboxmsg->print($file);
     $buffer;
 }
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Replace/MailInternet.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1015,9 +1015,8 @@
 =over 4
 
 Returns the whole message as one string, which can be included in an
-MBOX folder (while not using L<Mail::Box::Mbox|Mail::Box::Mbox>).  The C<Content-Length>
-header field is removed and lines in the body which start with C<From >
-are escaped with an E<gt>.
+MBOX folder (while not using L<Mail::Box::Mbox|Mail::Box::Mbox>).  Lines in the body
+which start with C<From > are escaped with an E<gt>.
 
 =back
 
@@ -1359,7 +1358,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::TransferEnc::Base64;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::TransferEnc';
 
 use MIME::Base64;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Base64.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -267,7 +267,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::TransferEnc::Binary;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::TransferEnc';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/Binary.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -249,7 +249,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::TransferEnc::EightBit;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::TransferEnc';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/EightBit.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -260,7 +260,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::TransferEnc::QuotedPrint;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::TransferEnc';
 
 use MIME::QuotedPrint;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/QuotedPrint.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -275,7 +275,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::TransferEnc::SevenBit;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Message::TransferEnc';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc/SevenBit.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -261,7 +261,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Message::TransferEnc;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/TransferEnc.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -323,7 +323,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message::Wrapper::SpamAssassin;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::SpamAssassin::Message';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message/Wrapper/SpamAssassin.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -59,7 +59,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Message;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Mail::Message::Part;
@@ -671,12 +671,12 @@
         $body->contentInfoFrom($head);
     }
 
-    my $lines   = $head->get('Lines');
+    my $lines   = $head->get('Lines');  # usually off-by-one
     my $size    = $head->guessBodySize;
 
     $body->read
       ( $parser, $head, $getbodytype,
-      , $size, (defined $lines ? int $lines->body : undef)
+      , $size, (defined $lines ? $lines : undef)
       );
 }
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Message.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -1660,7 +1660,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Reporter;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Carp;
 use Scalar::Util 'dualvar';

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Reporter.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -357,7 +357,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Server::IMAP4::Fetch;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 use Date::Parse;
 use Digest::MD5   qw/md5_base64/;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Fetch.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -155,7 +155,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Server::IMAP4::List;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 
 
 sub new($)

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/List.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -188,7 +188,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Server::IMAP4::Search;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Box::Search';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4/Search.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -274,7 +274,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Server::IMAP4;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Server';
 
 use Mail::Server::IMAP4::List;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server/IMAP4.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -215,7 +215,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Server;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Server.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -201,7 +201,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::Exim;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Send';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Exim.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -311,7 +311,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Transport::IMAP4;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Receive';
 
 use Digest::HMAC_MD5;   # only availability check for CRAM_MD5

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/IMAP4.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -588,7 +588,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::Mailx;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Send';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Mailx.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -334,7 +334,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -4,7 +4,7 @@
 
 package Mail::Transport::POP3;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Receive';
 
 use IO::Socket  ();

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/POP3.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -535,7 +535,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::Qmail;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Send';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Qmail.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -307,7 +307,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::Receive;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport';
 
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Receive.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -252,7 +252,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::SMTP;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Send';
 
 use Net::SMTP;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/SMTP.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -410,7 +410,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::Send;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Send.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -408,7 +408,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport::Sendmail;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Transport::Send';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport/Sendmail.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -328,7 +328,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pm
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pm	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pm	2006-03-14 13:08:21 UTC (rev 2341)
@@ -3,7 +3,7 @@
 
 package Mail::Transport;
 use vars '$VERSION';
-$VERSION = '2.063';
+$VERSION = '2.064';
 use base 'Mail::Reporter';
 
 use Carp;

Modified: packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pod
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pod	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/lib/Mail/Transport.pod	2006-03-14 13:08:21 UTC (rev 2341)
@@ -358,7 +358,7 @@
 
 =head1 COPYRIGHTS
 
-Distribution version 2.063.
+Distribution version 2.064.
 Written by Mark Overmeer (mark at overmeer.net).  See the ChangeLog for
 other contributors.
 

Modified: packages/libmail-box-perl/branches/upstream/current/tests/13body/40multip.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/13body/40multip.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/13body/40multip.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -84,12 +84,11 @@
 compare_message_prints($fakeout, <<'EXPECTED', 'print with attachment');
 --part-separator
 Content-Type: text/html
-Content-Length: 12
-Lines: 2
 Content-Transfer-Encoding: 8bit
 
 p1 l1
 p1 l2
+
 --part-separator--
 EXPECTED
 
@@ -104,22 +103,20 @@
 compare_message_prints($fakeout, <<'EXPECTED', 'print with two attachments');
 --part-separator
 Content-Type: text/html
-Content-Length: 12
-Lines: 2
 Content-Transfer-Encoding: 8bit
 
 p1 l1
 p1 l2
+
 --part-separator
 Content-Type: text/plain
-Content-Length: 24
-Lines: 4
 Content-Transfer-Encoding: 8bit
 
 p2 l1
 p2 l2
 p2 l3
 p2 l4
+
 --part-separator--
 EXPECTED
 
@@ -144,24 +141,23 @@
 compare_message_prints($fakeout, <<'EXPECTED', 'with preamble and epilogue');
 preamb1
 preamb2
+
 --part-separator
 Content-Type: text/html
-Content-Length: 12
-Lines: 2
 Content-Transfer-Encoding: 8bit
 
 p1 l1
 p1 l2
+
 --part-separator
 Content-Type: text/plain
-Content-Length: 24
-Lines: 4
 Content-Transfer-Encoding: 8bit
 
 p2 l1
 p2 l2
 p2 l3
 p2 l4
+
 --part-separator--
 epilogue
 EXPECTED
@@ -181,31 +177,28 @@
 Date: now
 Message-Id: <simple>
 Content-Type: multipart/mixed; boundary="part-separator"
-Content-Length: 287
-Lines: 24
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 
 preamb1
 preamb2
+
 --part-separator
 Content-Type: text/html
-Content-Length: 12
-Lines: 2
 Content-Transfer-Encoding: 8bit
 
 p1 l1
 p1 l2
+
 --part-separator
 Content-Type: text/plain
-Content-Length: 24
-Lines: 4
 Content-Transfer-Encoding: 8bit
 
 p2 l1
 p2 l2
 p2 l3
 p2 l4
+
 --part-separator--
 epilogue
 EXPECTED
@@ -221,8 +214,6 @@
 Date: now
 Message-Id: <simple>
 Content-Type: multipart/mixed; boundary="part-separator"
-Content-Length: 19
-Lines: 1
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 
@@ -240,8 +231,6 @@
 Date: now
 Message-Id: <simple>
 Content-Type: text/html
-Content-Length: 12
-Lines: 2
 Content-Transfer-Encoding: 8bit
 MIME-Version: 1.0
 

Modified: packages/libmail-box-perl/branches/upstream/current/tests/14fieldu/10full.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/14fieldu/10full.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/14fieldu/10full.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -134,14 +134,14 @@
 $utf8 = decode('iso-8859-1', $long);
 
 is($b->encode($utf8, charset => 'ISO-8859-9', language => 'nl-BE'),
-  '=?ISO-8859-9*nl-BE?q?This_is_a_long_ at text,_with_!!_a_few_w3iRD_=A1_=A2_=A3_?= '
-. '=?ISO-8859-9*nl-BE?q?=A4_=A5_=A6_=A7_=A8_=A9_=AA_=AB_=AC_=AD_=AE_=AF_=B0_=B1?= '
-. '=?ISO-8859-9*nl-BE?q?_=B2_=B3_=B4_characters_in_it...?='
+  '=?ISO-8859-9*nl-BE?q?This_is_a_long_ at text,_with_!!_a_few_w3iRD_=A1_=A2_=A3?= '
+. '=?ISO-8859-9*nl-BE?q?_=A4_=A5_=A6_=A7_=A8_=A9_=AA_=AB_=AC_=AD_=AE_=AF_=B0_?= '
+. '=?ISO-8859-9*nl-BE?q?=B1_=B2_=B3_=B4_characters_in_it...?='
   );
 is($b->encode($utf8, charset => 'ISO-8859-9'),
-  '=?ISO-8859-9?q?This_is_a_long_ at text,_with_!!_a_few_w3iRD_=A1_=A2_=A3_=A4_=A5?= '
-. '=?ISO-8859-9?q?_=A6_=A7_=A8_=A9_=AA_=AB_=AC_=AD_=AE_=AF_=B0_=B1_=B2_=B3_=B4_?= '
-. '=?ISO-8859-9?q?characters_in_it...?='
+  '=?ISO-8859-9?q?This_is_a_long_ at text,_with_!!_a_few_w3iRD_=A1_=A2_=A3_=A4_?= '
+.'=?ISO-8859-9?q?=A5_=A6_=A7_=A8_=A9_=AA_=AB_=AC_=AD_=AE_=AF_=B0_=B1_=B2_=B3?= '
+. '=?ISO-8859-9?q?_=B4_characters_in_it...?='
   );
 
 #

Modified: packages/libmail-box-perl/branches/upstream/current/tests/20pparser/34bodymp.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/20pparser/34bodymp.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/20pparser/34bodymp.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -66,11 +66,11 @@
     my $lines = $body->nrLines;
     my $su    = $head->get('Subject');
 
-    cmp_ok($li , "==",  $lines,                "1 lines $count")
+    cmp_ok($lines, "==",  $li,                "1 lines $count")
         if defined $li;
 
     $cl -= $li if $crlf_platform;
-    cmp_ok($cl , "==",  $size,                 "1 size $count")
+    cmp_ok($size , "==",  $cl,                 "1 size $count")
         if defined $cl;
 
     my $msg = 

Modified: packages/libmail-box-perl/branches/upstream/current/tests/20pparser/50nested.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/20pparser/50nested.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/20pparser/50nested.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -18,7 +18,7 @@
 # Reading a very complicate message from scalar
 #
 
-my $msg = Mail::Message->read(<<'END-OF-MESSAGE');
+my $msg = Mail::Message->read(<<'END-OF-MESSAGE', strip_status_fields => 0);
 From: "you" <You at your.place>
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="3/Cnt5Mj2+"
@@ -88,10 +88,10 @@
 # if 1550 bytes is reported for the whole message, then the Status
 # field hasn't been removed after reading.
 is($dump, <<'DUMP');
-multipart/mixed: forwarded message from Pietje Puk (1539 bytes)
+multipart/mixed: forwarded message from Pietje Puk (1551 bytes)
    text/plain (164 bytes)
-   message/rfc822 (1043 bytes)
-      multipart/alternative: A multipart alternative (942 bytes)
+   message/rfc822 (1044 bytes)
+      multipart/alternative: A multipart alternative (943 bytes)
          text/plain (148 bytes)
          text/html (358 bytes)
 DUMP

Modified: packages/libmail-box-perl/branches/upstream/current/tests/30encode/90body.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/30encode/90body.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/30encode/90body.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -61,8 +61,6 @@
 Date: now
 Message-Id: <simple>
 Content-Type: text/html
-Content-Length: 83
-Lines: 2
 Content-Transfer-Encoding: 7bit
 MIME-Version: 1.0
 

Modified: packages/libmail-box-perl/branches/upstream/current/tests/41mh/20write.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/41mh/20write.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/41mh/20write.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -40,14 +40,14 @@
 $folder->write(renumber => 0);
 
 ok(compare_lists [sort {$a cmp $b} listdir $mhsrc],
-            [sort {$a cmp $b} '.mh_sequences', 1..12, 14..46]
+            [sort {$a cmp $b} '.index', '.mh_sequences', 1..12, 14..46]
   );
 
 $folder->modified(1);
 $folder->write(renumber => 1);
 
 ok(compare_lists [sort {$a cmp $b} listdir $mhsrc],
-            [sort {$a cmp $b} '.mh_sequences', 1..45]
+            [sort {$a cmp $b} '.index', '.mh_sequences', 1..45]
   );
 
 $folder->message(2)->delete;

Modified: packages/libmail-box-perl/branches/upstream/current/tests/41mh/30append.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/41mh/30append.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/41mh/30append.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -73,9 +73,10 @@
 cmp_ok($mgr->openFolders, "==", 0);
 
 $mgr->appendMessage($mhsrc, $msg
-  , lock_type => 'NONE'
-  , extract   => 'LAZY'
-  , access    => 'rw'
+  , lock_type  => 'NONE'
+  , extract    => 'LAZY'
+  , access     => 'rw'
+  , keep_index => 1
   );
 
 ok(-f File::Spec->catfile($mhsrc, "47"));  # skipped 13, so new is 46+1

Modified: packages/libmail-box-perl/branches/upstream/current/tests/50message/30bounce.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/50message/30bounce.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/50message/30bounce.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -66,8 +66,6 @@
 Date: Wed, 9 Feb 2000 15:44:05 -0500
 Content-Something: something
 Content-Type: text/plain
-Content-Length: 53
-Lines: 2
 Content-Transfer-Encoding: 8bit
 Received: by me
 Resent-Date: Fri, 7 Dec 2001 15:44:05 -0100

Modified: packages/libmail-box-perl/branches/upstream/current/tests/50message/41forward.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/50message/41forward.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/50message/41forward.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -152,26 +152,22 @@
 Subject: Forwarded
 References: <removed>
 Content-Type: multipart/mixed; boundary="boundary-<removed>"
-Content-Length: <removed>
-Lines: 17
 Message-Id: <removed>
 Date: <removed>
 MIME-Version: 1.0
 
 --boundary-<removed>
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: 8bit
 
 just checking
+
 --boundary-<removed>
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: 8bit
 
 greetings!
+
 --boundary-<removed>--
 ATTACH
 
@@ -187,23 +183,18 @@
 Subject: Forwarded
 References: <removed>
 Content-Type: multipart/mixed; boundary="boundary-<removed>"
-Content-Length: <removed>
-Lines: 26
 Message-Id: <removed>
 Date: <removed>
 MIME-Version: 1.0
 
 --boundary-<removed>
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: 8bit
 
 just checking
+
 --boundary-<removed>
 Content-Type: message/rfc822
-Content-Length: <removed>
-Lines: 11
 
 To: you
 X-Loop: yes
@@ -211,11 +202,10 @@
 Date: <removed>
 MIME-Version: 1.0
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: 8bit
 
 greetings!
+
 --boundary-<removed>--
 ENCAPS
 
@@ -237,26 +227,22 @@
 Subject: Forwarded
 References: <removed>
 Content-Type: multipart/mixed; boundary="boundary-<removed>"
-Content-Length: <removed>
-Lines: 17
 Message-Id: <removed>
 Date: <removed>
 MIME-Version: 1.0
 
 --boundary-<removed>
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: 8bit
 
 just checking
+
 --boundary-<removed>
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: 8bit
 
 this is the first
+
 --boundary-<removed>--
 ATTACH
 
@@ -287,26 +273,22 @@
 Subject: Forwarded
 References: <removed>
 Content-Type: multipart/mixed; boundary="boundary-<removed>"
-Content-Length: <removed>
-Lines: 18
 Message-Id: <removed>
 Date: <removed>
 MIME-Version: 1.0
 
 --boundary-<removed>
 Content-Type: text/plain
-Content-Length: <removed>
-Lines: 3
 
 Prelude
 [The forwarded message is attached]
 Postlude
+
 --boundary-<removed>
 Content-Type: application/octet-stream
-Content-Length: <removed>
-Lines: 1
 Content-Transfer-Encoding: base64
 
 bGluZSAxCmxpbmUyCg==
+
 --boundary-<removed>--
 EXPECTED

Modified: packages/libmail-box-perl/branches/upstream/current/tests/60imap/10fetch.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/60imap/10fetch.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/60imap/10fetch.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -186,11 +186,11 @@
 #$b->print(\*STDERR);
 
 is($f->fetchBody(0)."\n", <<__BODY, "...body");
-("MESSAGE" "RFC822" () "<newid>" NIL "8BIT" 223 ("now" "Life of Brian" ("I myself and me" NIL "me" "localhost") NIL NIL (NIL NIL "you" "example.com") NIL NIL NIL "<unique>") ("TEXT" "PLAIN" () "<unique>" NIL "8BIT" 10 2) 13)
+("MESSAGE" "RFC822" () "<newid>" NIL "8BIT" 195 ("now" "Life of Brian" ("I myself and me" NIL "me" "localhost") NIL NIL (NIL NIL "you" "example.com") NIL NIL NIL "<unique>") ("TEXT" "PLAIN" () "<unique>" NIL "8BIT" 10 2) 11)
 __BODY
 
 is($f->fetchBody(1)."\n", <<__BODYSTRUCT, "...bodystruct");
-("MESSAGE" "RFC822" () "<newid>" NIL "8BIT" 223 ("now" "Life of Brian" ("I myself and me" NIL "me" "localhost") NIL NIL (NIL NIL "you" "example.com") NIL NIL NIL "<unique>") ("TEXT" "PLAIN" () "<unique>" NIL "8BIT" 10 2 NIL ("inline") NIL) 13 NIL ("inline") NIL)
+("MESSAGE" "RFC822" () "<newid>" NIL "8BIT" 195 ("now" "Life of Brian" ("I myself and me" NIL "me" "localhost") NIL NIL (NIL NIL "you" "example.com") NIL NIL NIL "<unique>") ("TEXT" "PLAIN" () "<unique>" NIL "8BIT" 10 2 NIL ("inline") NIL) 11 NIL ("inline") NIL)
 __BODYSTRUCT
 
 is($f->fetchEnvelope."\n", <<__ENVELOPE, "...envelope");

Modified: packages/libmail-box-perl/branches/upstream/current/tests/80msgconv/20mimeent.t
===================================================================
--- packages/libmail-box-perl/branches/upstream/current/tests/80msgconv/20mimeent.t	2006-03-13 21:26:33 UTC (rev 2340)
+++ packages/libmail-box-perl/branches/upstream/current/tests/80msgconv/20mimeent.t	2006-03-14 13:08:21 UTC (rev 2341)
@@ -118,7 +118,7 @@
 $body = $msg->body;
 cmp_ok($body->preamble->nrLines, "==", 2);
 cmp_ok($body->epilogue->nrLines, "==", 2);
-#$msg->print;
+#$msg->print(\*STDERR);
 
 $me->purge;
 




More information about the Pkg-perl-cvs-commits mailing list