The Perl Toolchain Summit needs more sponsors. If your company depends on Perl, please support this very important event.
Changes 320
LICENSE 334335
MANIFEST 2326
META.json 0491
META.yml 21357
Makefile.PL 1063
README 587
dist.ini 08
lib/Email/Folder/Ezmlm.pm 242
lib/Email/Folder/MH.pm 2553
lib/Email/Folder/Maildir.pm 2655
lib/Email/Folder/Mbox.pm 113333
lib/Email/Folder/Reader.pm 3982
lib/Email/Folder.pm 71131
t/000-report-versions-tiny.t 079
t/01mbox.t 11
t/pod-coverage.t 140
t/pod.t 70
t/testmh/.mh_sequences 00
xt/release/changes_has_content.t 041
xt/release/pod-syntax.t 06
21 files changed (This is a version diff) 7472130
@@ -1,5 +1,22 @@
 Revision history for Email-Folder
 
+0.859     2014-09-16 18:29:32-04:00 America/New_York
+        - all the changes in this release contributed by Pali Rohár
+        - support for mboxcl and mboxcl2
+        - add ability to read from a filehandle
+        - add next_from and next_messageref methods
+
+0.858     2014-01-07 10:54:18-05:00 America/New_York
+          typo fixes in docs (thanks, Florian Schlichting)
+
+0.857     2013-08-05 18:16:44 America/New_York
+          eliminate extra Pod tests
+
+0.856     2013-08-05 18:12:09 America/New_York
+          avoid duplicating headers when data is malformed (#31132)
+
+          make MH folder reader work on VMS
+
 0.855     2009-07-26
           fix pod tests
 
@@ -18,7 +35,7 @@ Revision history for Email-Folder
 
 0.85      Tuesday 4th April, 2006
           Fix clobbering of $_ in Mbox.pm
-          Put FH in binmode to fix non-ascii mails on Windows   
+          Put FH in binmode to fix non-ascii mails on Windows
 
 0.84      Friday 17th December, 2004
           Added in ability for subclasses of Email::Folder::Mbox to override
@@ -37,7 +54,7 @@ HEAD
 
           Switch to a trad Makefile.PL
 
-0.81      
+0.81
           Slow down the release numbering a bit.  I'd like to be stable at
           the point of 1.0 or so.
 
@@ -46,7 +63,7 @@ HEAD
           Added ->tell to ::Mbox, and seek_to as an option
 
 0.8       29th May, 2003
-          mboxcl2 handling is now a little more paranoid, and will recover from 
+          mboxcl2 handling is now a little more paranoid, and will recover from
           bad values
 
           Mbox.pm now expects the From_ line to match either of
@@ -1,276 +1,282 @@
+This software is copyright (c) 2006 by Simon Wistow.
 
-Terms of Perl itself
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+Terms of the Perl programming language system itself
 
 a) the GNU General Public License as published by the Free
    Software Foundation; either version 1, or (at your option) any
    later version, or
 b) the "Artistic License"
 
-----------------------------------------------------------------------------
+--- The GNU General Public License, Version 1, February 1989 ---
+
+This software is Copyright (c) 2006 by Simon Wistow.
+
+This is free software, licensed under:
+
+  The GNU General Public License, Version 1, February 1989
+
+                    GNU GENERAL PUBLIC LICENSE
+                     Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The license agreements of most software companies try to keep users
+at the mercy of those companies.  By contrast, our General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  The
+General Public License applies to the Free Software Foundation's
+software and to any other program whose authors commit to using it.
+You can use it for your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Specifically, the General Public License is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of a such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License.  The
+"Program", below, refers to any such program or work, and a "work based
+on the Program" means either the Program or any work containing the
+Program or a portion of it, either verbatim or with modifications.  Each
+licensee is addressed as "you".
+
+  1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this General Public License
+along with the Program.  You may charge a fee for the physical act of
+transferring a copy.
+
+  2. You may modify your copy or copies of the Program or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating that
+    you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish, that
+    in whole or in part contains the Program or any part thereof, either
+    with or without modifications, to be licensed at no charge to all
+    third parties under the terms of this General Public License (except
+    that you may choose to grant warranty protection to some or all
+    third parties, at your option).
+
+    c) If the modified program normally reads commands interactively when
+    run, you must cause it, when started running for such interactive use
+    in the simplest and most usual way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this General
+    Public License.
+
+    d) You may charge a fee for the physical act of transferring a
+    copy, and you may at your option offer warranty protection in
+    exchange for a fee.
+
+Mere aggregation of another independent work with the Program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+  3. You may copy and distribute the Program (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal charge
+    for the cost of distribution) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it.  For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+  4. You may not copy, modify, sublicense, distribute or transfer the
+Program except as expressly provided under this General Public License.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Program is void, and will automatically terminate your rights to use
+the Program under this License.  However, parties who have received
+copies, or rights to use copies, from you under this General Public
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+  5. By copying, distributing or modifying the Program (or any work based
+on the Program) you indicate your acceptance of this license to do so,
+and all its terms and conditions.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these
+terms and conditions.  You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+  7. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of the license which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+the license, you may choose any version ever published by the Free Software
+Foundation.
+
+  8. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+        Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+  To do so, attach the following notices to the program.  It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19xx name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
 
-The General Public License (GPL)
-Version 2, June 1991
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here a sample; alter the names:
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
-verbatim copies of this license document, but changing it is not allowed.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  program `Gnomovision' (a program to direct compilers to make passes
+  at assemblers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+That's all there is to it!
 
-Preamble
 
-The licenses for most software are designed to take away your freedom to share
-and change it. By contrast, the GNU General Public License is intended to
-guarantee your freedom to share and change free software--to make sure the
-software is free for all its users. This General Public License applies to most of
-the Free Software Foundation's software and to any other program whose
-authors commit to using it. (Some other Free Software Foundation software is
-covered by the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our
-General Public Licenses are designed to make sure that you have the freedom
-to distribute copies of free software (and charge for this service if you wish), that
-you receive source code or can get it if you want it, that you can change the
-software or use pieces of it in new free programs; and that you know you can do
-these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny
-you these rights or to ask you to surrender the rights. These restrictions
-translate to certain responsibilities for you if you distribute copies of the
-software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a
-fee, you must give the recipients all the rights that you have. You must make
-sure that they, too, receive or can get the source code. And you must show
-them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer
-you this license which gives you legal permission to copy, distribute and/or
-modify the software.
-
-Also, for each author's protection and ours, we want to make certain that
-everyone understands that there is no warranty for this free software. If the
-software is modified by someone else and passed on, we want its recipients to
-know that what they have is not the original, so that any problems introduced by
-others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish
-to avoid the danger that redistributors of a free program will individually obtain
-patent licenses, in effect making the program proprietary. To prevent this, we
-have made it clear that any patent must be licensed for everyone's free use or
-not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification
-follow.
-
-GNU GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
-MODIFICATION
-
-0. This License applies to any program or other work which contains a notice
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License. The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or translated
-into another language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by
-this License; they are outside its scope. The act of running the Program is not
-restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as
-you receive it, in any medium, provided that you conspicuously and appropriately
-publish on each copy an appropriate copyright notice and disclaimer of warranty;
-keep intact all the notices that refer to this License and to the absence of any
-warranty; and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at
-your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus
-forming a work based on the Program, and copy and distribute such
-modifications or work under the terms of Section 1 above, provided that you also
-meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices stating that you
-changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in whole or in
-part contains or is derived from the Program or any part thereof, to be licensed
-as a whole at no charge to all third parties under the terms of this License.
-
-c) If the modified program normally reads commands interactively when run, you
-must cause it, when started running for such interactive use in the most ordinary
-way, to print or display an announcement including an appropriate copyright
-notice and a notice that there is no warranty (or else, saying that you provide a
-warranty) and that users may redistribute the program under these conditions,
-and telling the user how to view a copy of this License. (Exception: if the
-Program itself is interactive but does not normally print such an announcement,
-your work based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable
-sections of that work are not derived from the Program, and can be reasonably
-considered independent and separate works in themselves, then this License,
-and its terms, do not apply to those sections when you distribute them as
-separate works. But when you distribute the same sections as part of a whole
-which is a work based on the Program, the distribution of the whole must be on
-the terms of this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to
-work written entirely by you; rather, the intent is to exercise the right to control
-the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
-
-3. You may copy and distribute the Program (or a work based on it, under
-Section 2) in object code or executable form under the terms of Sections 1 and 2
-above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable source
-code, which must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years, to give any
-third party, for a charge no more than your cost of physically performing source
-distribution, a complete machine-readable copy of the corresponding source
-code, to be distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
-
-c) Accompany it with the information you received as to the offer to distribute
-corresponding source code. (This alternative is allowed only for noncommercial
-distribution and only if you received the program in object code or executable
-form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making
-modifications to it. For an executable work, complete source code means all the
-source code for all modules it contains, plus any associated interface definition
-files, plus the scripts used to control compilation and installation of the
-executable. However, as a special exception, the source code distributed need
-not include anything that is normally distributed (in either source or binary form)
-with the major components (compiler, kernel, and so on) of the operating system
-on which the executable runs, unless that component itself accompanies the
-executable.
-
-If distribution of executable or object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the source
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as
-expressly provided under this License. Any attempt otherwise to copy, modify,
-sublicense or distribute the Program is void, and will automatically terminate
-your rights under this License. However, parties who have received copies, or
-rights, from you under this License will not have their licenses terminated so long
-as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it.
-However, nothing else grants you permission to modify or distribute the Program
-or its derivative works. These actions are prohibited by law if you do not accept
-this License. Therefore, by modifying or distributing the Program (or any work
-based on the Program), you indicate your acceptance of this License to do so,
-and all its terms and conditions for copying, distributing or modifying the
-Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program),
-the recipient automatically receives a license from the original licensor to copy,
-distribute or modify the Program subject to these terms and conditions. You
-may not impose any further restrictions on the recipients' exercise of the rights
-granted herein. You are not responsible for enforcing compliance by third parties
-to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement
-or for any other reason (not limited to patent issues), conditions are imposed on
-you (whether by court order, agreement or otherwise) that contradict the
-conditions of this License, they do not excuse you from the conditions of this
-License. If you cannot distribute so as to satisfy simultaneously your obligations
-under this License and any other pertinent obligations, then as a consequence
-you may not distribute the Program at all. For example, if a patent license would
-not permit royalty-free redistribution of the Program by all those who receive
-copies directly or indirectly through you, then the only way you could satisfy
-both it and this License would be to refrain entirely from distribution of the
-Program.
-
-If any portion of this section is held invalid or unenforceable under any particular
-circumstance, the balance of the section is intended to apply and the section as
-a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other
-property right claims or to contest validity of any such claims; this section has
-the sole purpose of protecting the integrity of the free software distribution
-system, which is implemented by public license practices. Many people have
-made generous contributions to the wide range of software distributed through
-that system in reliance on consistent application of that system; it is up to the
-author/donor to decide if he or she is willing to distribute software through any
-other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a
-consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries
-either by patents or by copyrighted interfaces, the original copyright holder who
-places the Program under this License may add an explicit geographical
-distribution limitation excluding those countries, so that distribution is permitted
-only in or among countries not thus excluded. In such case, this License
-incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the
-General Public License from time to time. Such new versions will be similar in
-spirit to the present version, but may differ in detail to address new problems or
-concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a
-version number of this License which applies to it and "any later version", you
-have the option of following the terms and conditions either of that version or of
-any later version published by the Free Software Foundation. If the Program does
-not specify a version number of this License, you may choose any version ever
-published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs
-whose distribution conditions are different, write to the author to ask for
-permission. For software which is copyrighted by the Free Software Foundation,
-write to the Free Software Foundation; we sometimes make exceptions for this.
-Our decision will be guided by the two goals of preserving the free status of all
-derivatives of our free software and of promoting the sharing and reuse of
-software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS
-NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM
-"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE,
-YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED
-TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
-WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS
-PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
-OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-----------------------------------------------------------------------------
+--- The Artistic License 1.0 ---
+
+This software is Copyright (c) 2006 by Simon Wistow.
+
+This is free software, licensed under:
+
+  The Artistic License 1.0
 
 The Artistic License
 
@@ -278,88 +284,85 @@ Preamble
 
 The intent of this document is to state the conditions under which a Package
 may be copied, such that the Copyright Holder maintains some semblance of
-artistic control over the development of the package, while giving the users of the
-package the right to use and distribute the Package in a more-or-less customary
-fashion, plus the right to make reasonable modifications.
+artistic control over the development of the package, while giving the users of
+the package the right to use and distribute the Package in a more-or-less
+customary fashion, plus the right to make reasonable modifications.
 
 Definitions:
 
--    "Package" refers to the collection of files distributed by the Copyright
-     Holder, and derivatives of that collection of files created through textual
-     modification. 
--    "Standard Version" refers to such a Package if it has not been modified,
-     or has been modified in accordance with the wishes of the Copyright
-     Holder. 
--    "Copyright Holder" is whoever is named in the copyright or copyrights for
-     the package. 
--    "You" is you, if you're thinking about copying or distributing this Package.
--    "Reasonable copying fee" is whatever you can justify on the basis of
-     media cost, duplication charges, time of people involved, and so on. (You
-     will not be required to justify it to the Copyright Holder, but only to the
-     computing community at large as a market that must bear the fee.) 
--    "Freely Available" means that no fee is charged for the item itself, though
-     there may be fees involved in handling the item. It also means that
-     recipients of the item may redistribute it under the same conditions they
-     received it. 
+  - "Package" refers to the collection of files distributed by the Copyright
+    Holder, and derivatives of that collection of files created through
+    textual modification. 
+  - "Standard Version" refers to such a Package if it has not been modified,
+    or has been modified in accordance with the wishes of the Copyright
+    Holder. 
+  - "Copyright Holder" is whoever is named in the copyright or copyrights for
+    the package. 
+  - "You" is you, if you're thinking about copying or distributing this Package.
+  - "Reasonable copying fee" is whatever you can justify on the basis of media
+    cost, duplication charges, time of people involved, and so on. (You will
+    not be required to justify it to the Copyright Holder, but only to the
+    computing community at large as a market that must bear the fee.) 
+  - "Freely Available" means that no fee is charged for the item itself, though
+    there may be fees involved in handling the item. It also means that
+    recipients of the item may redistribute it under the same conditions they
+    received it. 
 
 1. You may make and give away verbatim copies of the source form of the
-Standard Version of this Package without restriction, provided that you duplicate
-all of the original copyright notices and associated disclaimers.
-
-2. You may apply bug fixes, portability fixes and other modifications derived from
-the Public Domain or from the Copyright Holder. A Package modified in such a
-way shall still be considered the Standard Version.
-
-3. You may otherwise modify your copy of this Package in any way, provided
-that you insert a prominent notice in each changed file stating how and when
-you changed that file, and provided that you do at least ONE of the following:
-
-     a) place your modifications in the Public Domain or otherwise
-     make them Freely Available, such as by posting said modifications
-     to Usenet or an equivalent medium, or placing the modifications on
-     a major archive site such as ftp.uu.net, or by allowing the
-     Copyright Holder to include your modifications in the Standard
-     Version of the Package.
-
-     b) use the modified Package only within your corporation or
-     organization.
-
-     c) rename any non-standard executables so the names do not
-     conflict with standard executables, which must also be provided,
-     and provide a separate manual page for each non-standard
-     executable that clearly documents how it differs from the Standard
-     Version.
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
 
-     d) make other distribution arrangements with the Copyright Holder.
+2. You may apply bug fixes, portability fixes and other modifications derived
+from the Public Domain or from the Copyright Holder. A Package modified in such
+a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided that
+you insert a prominent notice in each changed file stating how and when you
+changed that file, and provided that you do at least ONE of the following:
+
+  a) place your modifications in the Public Domain or otherwise make them
+     Freely Available, such as by posting said modifications to Usenet or an
+     equivalent medium, or placing the modifications on a major archive site
+     such as ftp.uu.net, or by allowing the Copyright Holder to include your
+     modifications in the Standard Version of the Package.
+
+  b) use the modified Package only within your corporation or organization.
+
+  c) rename any non-standard executables so the names do not conflict with
+     standard executables, which must also be provided, and provide a separate
+     manual page for each non-standard executable that clearly documents how it
+     differs from the Standard Version.
+
+  d) make other distribution arrangements with the Copyright Holder.
 
 4. You may distribute the programs of this Package in object code or executable
 form, provided that you do at least ONE of the following:
 
-     a) distribute a Standard Version of the executables and library
-     files, together with instructions (in the manual page or equivalent)
-     on where to get the Standard Version.
+  a) distribute a Standard Version of the executables and library files,
+     together with instructions (in the manual page or equivalent) on where to
+     get the Standard Version.
 
-     b) accompany the distribution with the machine-readable source of
-     the Package with your modifications.
+  b) accompany the distribution with the machine-readable source of the Package
+     with your modifications.
 
-     c) accompany any non-standard executables with their
-     corresponding Standard Version executables, giving the
-     non-standard executables non-standard names, and clearly
-     documenting the differences in manual pages (or equivalent),
-     together with instructions on where to get the Standard Version.
+  c) accompany any non-standard executables with their corresponding Standard
+     Version executables, giving the non-standard executables non-standard
+     names, and clearly documenting the differences in manual pages (or
+     equivalent), together with instructions on where to get the Standard
+     Version.
 
-     d) make other distribution arrangements with the Copyright Holder.
+  d) make other distribution arrangements with the Copyright Holder.
 
-5. You may charge a reasonable copying fee for any distribution of this Package.
-You may charge any fee you choose for support of this Package. You may not
-charge a fee for this Package itself. However, you may distribute this Package in
-aggregate with other (possibly commercial) programs as part of a larger
-(possibly commercial) software distribution provided that you do not advertise
-this Package as a product of your own.
+5. You may charge a reasonable copying fee for any distribution of this
+Package.  You may charge any fee you choose for support of this Package. You
+may not charge a fee for this Package itself. However, you may distribute this
+Package in aggregate with other (possibly commercial) programs as part of a
+larger (possibly commercial) software distribution provided that you do not
+advertise this Package as a product of your own.
 
-6. The scripts and library files supplied as input to or produced as output from
-the programs of this Package do not automatically fall under the copyright of this
-Package, but belong to whomever generated them, and may be sold
+6. The scripts and library files supplied as input to or produced as output
+from the programs of this Package do not automatically fall under the copyright
+of this Package, but belong to whomever generated them, and may be sold
 commercially, and may be aggregated with this Package.
 
 7. C or perl subroutines supplied by you and linked into this Package shall not
@@ -368,11 +371,9 @@ be considered part of this Package.
 8. The name of the Copyright Holder may not be used to endorse or promote
 products derived from this software without specific prior written permission.
 
-9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 The End
 
-
@@ -1,41 +1,44 @@
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.020.
 Changes
+LICENSE
+MANIFEST
+META.json
+META.yml
+Makefile.PL
+README
+TODO
+dist.ini
 lib/Email/Folder.pm
 lib/Email/Folder/Ezmlm.pm
+lib/Email/Folder/MH.pm
 lib/Email/Folder/Maildir.pm
 lib/Email/Folder/Mbox.pm
-lib/Email/Folder/MH.pm
 lib/Email/Folder/Reader.pm
-README
-MANIFEST
-Makefile.PL
-TODO
+t/000-report-versions-tiny.t
 t/01mbox.t
 t/02maildir.t
 t/03mh.t
-t/pod.t
-t/pod-coverage.t
-t/testmh/.mh_sequences
-t/testmh/1
-t/testmh/2
-t/testmh/3
-t/testmh/4
 t/mboxes/mboxcl2
 t/mboxes/mboxcl2.lies
 t/mboxes/mboxcl3
 t/mboxes/testmbox
-t/mboxes/testmbox.mac
 t/mboxes/testmbox.dos
 t/mboxes/testmbox.empty
-t/testmaildir/new/1050314226.9981_1.penfold
-t/testmaildir/tmp/1050314226.9981_8.penfold
+t/mboxes/testmbox.mac
 t/testmaildir/cur/1050314226.9981_11.penfold
-t/testmaildir/cur/1050314226.9981_19.penfold
-t/testmaildir/cur/1050314226.9981_9.penfold
-t/testmaildir/cur/1050314226.9981_17.penfold
-t/testmaildir/cur/1050314226.9981_7.penfold
-t/testmaildir/cur/1050314226.9981_15.penfold
-t/testmaildir/cur/1050314226.9981_5.penfold
 t/testmaildir/cur/1050314226.9981_13.penfold
+t/testmaildir/cur/1050314226.9981_15.penfold
+t/testmaildir/cur/1050314226.9981_17.penfold
+t/testmaildir/cur/1050314226.9981_19.penfold
 t/testmaildir/cur/1050314226.9981_3.penfold
-LICENSE
-META.yml                                 Module meta-data (added by MakeMaker)
+t/testmaildir/cur/1050314226.9981_5.penfold
+t/testmaildir/cur/1050314226.9981_7.penfold
+t/testmaildir/cur/1050314226.9981_9.penfold
+t/testmaildir/new/1050314226.9981_1.penfold
+t/testmaildir/tmp/1050314226.9981_8.penfold
+t/testmh/1
+t/testmh/2
+t/testmh/3
+t/testmh/4
+xt/release/changes_has_content.t
+xt/release/pod-syntax.t
@@ -0,0 +1,491 @@
+{
+   "abstract" : "read all the messages from a folder as Email::Simple objects",
+   "author" : [
+      "Simon Wistow <simon@thegestalt.org>",
+      "Richard Clamp <richardc@unixbeard.net>"
+   ],
+   "dynamic_config" : 0,
+   "generated_by" : "Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "Email-Folder",
+   "prereqs" : {
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "develop" : {
+         "requires" : {
+            "Test::Pod" : "1.41",
+            "version" : "0.9901"
+         }
+      },
+      "runtime" : {
+         "requires" : {
+            "Carp" : "0",
+            "Email::FolderType" : "0.6",
+            "Email::Simple" : "0",
+            "IO::File" : "0",
+            "constant" : "0",
+            "parent" : "0",
+            "strict" : "0",
+            "warnings" : "0"
+         }
+      },
+      "test" : {
+         "requires" : {
+            "Test::More" : "0.96"
+         }
+      }
+   },
+   "release_status" : "stable",
+   "resources" : {
+      "bugtracker" : {
+         "web" : "https://github.com/rjbs/Email-Folder/issues"
+      },
+      "homepage" : "https://github.com/rjbs/Email-Folder",
+      "repository" : {
+         "type" : "git",
+         "url" : "https://github.com/rjbs/Email-Folder.git",
+         "web" : "https://github.com/rjbs/Email-Folder"
+      }
+   },
+   "version" : "0.859",
+   "x_Dist_Zilla" : {
+      "perl" : {
+         "version" : "5.021003"
+      },
+      "plugins" : [
+         {
+            "class" : "Dist::Zilla::Plugin::Git::GatherDir",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::GatherDir" : {
+                  "include_untracked" : "0"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@RJBS/Git::GatherDir",
+            "version" : "2.024"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed",
+            "name" : "@RJBS/CheckPrereqsIndexed",
+            "version" : "0.012"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::CheckExtraTests",
+            "name" : "@RJBS/CheckExtraTests",
+            "version" : "0.022"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PromptIfStale",
+            "config" : {
+               "Dist::Zilla::Plugin::PromptIfStale" : {
+                  "check_all_plugins" : 0,
+                  "check_all_prereqs" : 0,
+                  "modules" : [
+                     "Dist::Zilla::PluginBundle::RJBS"
+                  ],
+                  "phase" : "build",
+                  "skip" : []
+               }
+            },
+            "name" : "@RJBS/RJBS-Outdated",
+            "version" : "0.026"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PromptIfStale",
+            "config" : {
+               "Dist::Zilla::Plugin::PromptIfStale" : {
+                  "check_all_plugins" : "1",
+                  "check_all_prereqs" : 0,
+                  "modules" : [],
+                  "phase" : "release",
+                  "skip" : []
+               }
+            },
+            "name" : "@RJBS/CPAN-Outdated",
+            "version" : "0.026"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PruneCruft",
+            "name" : "@RJBS/@Filter/PruneCruft",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ManifestSkip",
+            "name" : "@RJBS/@Filter/ManifestSkip",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaYAML",
+            "name" : "@RJBS/@Filter/MetaYAML",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::License",
+            "name" : "@RJBS/@Filter/License",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Readme",
+            "name" : "@RJBS/@Filter/Readme",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ExecDir",
+            "name" : "@RJBS/@Filter/ExecDir",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ShareDir",
+            "name" : "@RJBS/@Filter/ShareDir",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Manifest",
+            "name" : "@RJBS/@Filter/Manifest",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::TestRelease",
+            "name" : "@RJBS/@Filter/TestRelease",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ConfirmRelease",
+            "name" : "@RJBS/@Filter/ConfirmRelease",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::UploadToCPAN",
+            "name" : "@RJBS/@Filter/UploadToCPAN",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MakeMaker",
+            "config" : {
+               "Dist::Zilla::Role::TestRunner" : {
+                  "default_jobs" : 9
+               }
+            },
+            "name" : "@RJBS/MakeMaker",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::AutoPrereqs",
+            "name" : "@RJBS/AutoPrereqs",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::NextVersion",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::NextVersion" : {
+                  "first_version" : "0.001",
+                  "version_by_branch" : "0",
+                  "version_regexp" : "(?^:^([0-9]+\\.[0-9]+)$)"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@RJBS/Git::NextVersion",
+            "version" : "2.024"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PkgVersion",
+            "name" : "@RJBS/PkgVersion",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaConfig",
+            "name" : "@RJBS/MetaConfig",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaJSON",
+            "name" : "@RJBS/MetaJSON",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::NextRelease",
+            "name" : "@RJBS/NextRelease",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Test::ChangesHasContent",
+            "name" : "@RJBS/Test::ChangesHasContent",
+            "version" : "0.006"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
+            "name" : "@RJBS/PodSyntaxTests",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::ReportVersions::Tiny",
+            "name" : "@RJBS/ReportVersions::Tiny",
+            "version" : "1.10"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Prereqs",
+            "config" : {
+               "Dist::Zilla::Plugin::Prereqs" : {
+                  "phase" : "test",
+                  "type" : "requires"
+               }
+            },
+            "name" : "@RJBS/TestMoreWithSubtests",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::PodWeaver",
+            "config" : {
+               "Dist::Zilla::Plugin::PodWeaver" : {
+                  "config_plugins" : [
+                     "@RJBS"
+                  ],
+                  "finder" : [
+                     ":InstallModules",
+                     ":ExecFiles"
+                  ],
+                  "plugins" : [
+                     {
+                        "class" : "Pod::Weaver::Plugin::EnsurePod5",
+                        "name" : "@CorePrep/EnsurePod5",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Plugin::H1Nester",
+                        "name" : "@CorePrep/H1Nester",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Plugin::SingleEncoding",
+                        "name" : "@RJBS/SingleEncoding",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Name",
+                        "name" : "@RJBS/Name",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Version",
+                        "name" : "@RJBS/Version",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Region",
+                        "name" : "@RJBS/Prelude",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "@RJBS/Synopsis",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "@RJBS/Description",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "@RJBS/Overview",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Generic",
+                        "name" : "@RJBS/Stability",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Collect",
+                        "name" : "Attributes",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Collect",
+                        "name" : "Methods",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Collect",
+                        "name" : "Functions",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Leftovers",
+                        "name" : "@RJBS/Leftovers",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Region",
+                        "name" : "@RJBS/postlude",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Authors",
+                        "name" : "@RJBS/Authors",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Section::Legal",
+                        "name" : "@RJBS/Legal",
+                        "version" : "4.006"
+                     },
+                     {
+                        "class" : "Pod::Weaver::Plugin::Transformer",
+                        "name" : "@RJBS/List",
+                        "version" : "4.006"
+                     }
+                  ]
+               }
+            },
+            "name" : "@RJBS/PodWeaver",
+            "version" : "4.006"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::GithubMeta",
+            "name" : "@RJBS/GithubMeta",
+            "version" : "0.46"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Check",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Check" : {
+                  "untracked_files" : "die"
+               },
+               "Dist::Zilla::Role::Git::DirtyFiles" : {
+                  "allow_dirty" : [
+                     "dist.ini",
+                     "Changes"
+                  ],
+                  "allow_dirty_match" : [],
+                  "changelog" : "Changes"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@RJBS/@Git/Check",
+            "version" : "2.024"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Commit",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Commit" : {
+                  "add_files_in" : [],
+                  "commit_msg" : "v%v%n%n%c",
+                  "time_zone" : "local"
+               },
+               "Dist::Zilla::Role::Git::DirtyFiles" : {
+                  "allow_dirty" : [
+                     "dist.ini",
+                     "Changes"
+                  ],
+                  "allow_dirty_match" : [],
+                  "changelog" : "Changes"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@RJBS/@Git/Commit",
+            "version" : "2.024"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Tag",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Tag" : {
+                  "branch" : null,
+                  "signed" : 0,
+                  "tag" : "0.859",
+                  "tag_format" : "%v",
+                  "tag_message" : "v%v",
+                  "time_zone" : "local"
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@RJBS/@Git/Tag",
+            "version" : "2.024"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::Git::Push",
+            "config" : {
+               "Dist::Zilla::Plugin::Git::Push" : {
+                  "push_to" : [
+                     "origin :",
+                     "github :"
+                  ],
+                  "remotes_must_exist" : 0
+               },
+               "Dist::Zilla::Role::Git::Repo" : {
+                  "repo_root" : "."
+               }
+            },
+            "name" : "@RJBS/@Git/Push",
+            "version" : "2.024"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":InstallModules",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":IncModules",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":TestFiles",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ExecFiles",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":ShareFiles",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":MainModule",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":AllFiles",
+            "version" : "5.020"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":NoFiles",
+            "version" : "5.020"
+         }
+      ],
+      "zilla" : {
+         "class" : "Dist::Zilla::Dist::Builder",
+         "config" : {
+            "is_trial" : "0"
+         },
+         "version" : "5.020"
+      }
+   }
+}
+
@@ -1,23 +1,359 @@
---- #YAML:1.0
-name:               Email-Folder
-version:            0.855
-abstract:           ~
-author:  []
-license:            perl
-distribution_type:  module
-configure_requires:
-    ExtUtils::MakeMaker:  0
+---
+abstract: 'read all the messages from a folder as Email::Simple objects'
+author:
+  - 'Simon Wistow <simon@thegestalt.org>'
+  - 'Richard Clamp <richardc@unixbeard.net>'
 build_requires:
-    ExtUtils::MakeMaker:  0
-requires:
-    Email::FolderType:  0.6
-    Email::Simple:      0
-    Test::More:         0.47
-no_index:
-    directory:
-        - t
-        - inc
-generated_by:       ExtUtils::MakeMaker version 6.50
+  Test::More: '0.96'
+configure_requires:
+  ExtUtils::MakeMaker: '0'
+dynamic_config: 0
+generated_by: 'Dist::Zilla version 5.020, CPAN::Meta::Converter version 2.142060'
+license: perl
 meta-spec:
-    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
-    version:  1.4
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: '1.4'
+name: Email-Folder
+requires:
+  Carp: '0'
+  Email::FolderType: '0.6'
+  Email::Simple: '0'
+  IO::File: '0'
+  constant: '0'
+  parent: '0'
+  strict: '0'
+  warnings: '0'
+resources:
+  bugtracker: https://github.com/rjbs/Email-Folder/issues
+  homepage: https://github.com/rjbs/Email-Folder
+  repository: https://github.com/rjbs/Email-Folder.git
+version: '0.859'
+x_Dist_Zilla:
+  perl:
+    version: '5.021003'
+  plugins:
+    -
+      class: Dist::Zilla::Plugin::Git::GatherDir
+      config:
+        Dist::Zilla::Plugin::Git::GatherDir:
+          include_untracked: '0'
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@RJBS/Git::GatherDir'
+      version: '2.024'
+    -
+      class: Dist::Zilla::Plugin::CheckPrereqsIndexed
+      name: '@RJBS/CheckPrereqsIndexed'
+      version: '0.012'
+    -
+      class: Dist::Zilla::Plugin::CheckExtraTests
+      name: '@RJBS/CheckExtraTests'
+      version: '0.022'
+    -
+      class: Dist::Zilla::Plugin::PromptIfStale
+      config:
+        Dist::Zilla::Plugin::PromptIfStale:
+          check_all_plugins: 0
+          check_all_prereqs: 0
+          modules:
+            - Dist::Zilla::PluginBundle::RJBS
+          phase: build
+          skip: []
+      name: '@RJBS/RJBS-Outdated'
+      version: '0.026'
+    -
+      class: Dist::Zilla::Plugin::PromptIfStale
+      config:
+        Dist::Zilla::Plugin::PromptIfStale:
+          check_all_plugins: '1'
+          check_all_prereqs: 0
+          modules: []
+          phase: release
+          skip: []
+      name: '@RJBS/CPAN-Outdated'
+      version: '0.026'
+    -
+      class: Dist::Zilla::Plugin::PruneCruft
+      name: '@RJBS/@Filter/PruneCruft'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::ManifestSkip
+      name: '@RJBS/@Filter/ManifestSkip'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::MetaYAML
+      name: '@RJBS/@Filter/MetaYAML'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::License
+      name: '@RJBS/@Filter/License'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::Readme
+      name: '@RJBS/@Filter/Readme'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::ExecDir
+      name: '@RJBS/@Filter/ExecDir'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::ShareDir
+      name: '@RJBS/@Filter/ShareDir'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::Manifest
+      name: '@RJBS/@Filter/Manifest'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::TestRelease
+      name: '@RJBS/@Filter/TestRelease'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::ConfirmRelease
+      name: '@RJBS/@Filter/ConfirmRelease'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::UploadToCPAN
+      name: '@RJBS/@Filter/UploadToCPAN'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::MakeMaker
+      config:
+        Dist::Zilla::Role::TestRunner:
+          default_jobs: 9
+      name: '@RJBS/MakeMaker'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::AutoPrereqs
+      name: '@RJBS/AutoPrereqs'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::Git::NextVersion
+      config:
+        Dist::Zilla::Plugin::Git::NextVersion:
+          first_version: '0.001'
+          version_by_branch: '0'
+          version_regexp: (?^:^([0-9]+\.[0-9]+)$)
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@RJBS/Git::NextVersion'
+      version: '2.024'
+    -
+      class: Dist::Zilla::Plugin::PkgVersion
+      name: '@RJBS/PkgVersion'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::MetaConfig
+      name: '@RJBS/MetaConfig'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::MetaJSON
+      name: '@RJBS/MetaJSON'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::NextRelease
+      name: '@RJBS/NextRelease'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::Test::ChangesHasContent
+      name: '@RJBS/Test::ChangesHasContent'
+      version: '0.006'
+    -
+      class: Dist::Zilla::Plugin::PodSyntaxTests
+      name: '@RJBS/PodSyntaxTests'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::ReportVersions::Tiny
+      name: '@RJBS/ReportVersions::Tiny'
+      version: '1.10'
+    -
+      class: Dist::Zilla::Plugin::Prereqs
+      config:
+        Dist::Zilla::Plugin::Prereqs:
+          phase: test
+          type: requires
+      name: '@RJBS/TestMoreWithSubtests'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::PodWeaver
+      config:
+        Dist::Zilla::Plugin::PodWeaver:
+          config_plugins:
+            - '@RJBS'
+          finder:
+            - ':InstallModules'
+            - ':ExecFiles'
+          plugins:
+            -
+              class: Pod::Weaver::Plugin::EnsurePod5
+              name: '@CorePrep/EnsurePod5'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Plugin::H1Nester
+              name: '@CorePrep/H1Nester'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Plugin::SingleEncoding
+              name: '@RJBS/SingleEncoding'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Name
+              name: '@RJBS/Name'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Version
+              name: '@RJBS/Version'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Region
+              name: '@RJBS/Prelude'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: '@RJBS/Synopsis'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: '@RJBS/Description'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: '@RJBS/Overview'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Generic
+              name: '@RJBS/Stability'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Collect
+              name: Attributes
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Collect
+              name: Methods
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Collect
+              name: Functions
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Leftovers
+              name: '@RJBS/Leftovers'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Region
+              name: '@RJBS/postlude'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Authors
+              name: '@RJBS/Authors'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Section::Legal
+              name: '@RJBS/Legal'
+              version: '4.006'
+            -
+              class: Pod::Weaver::Plugin::Transformer
+              name: '@RJBS/List'
+              version: '4.006'
+      name: '@RJBS/PodWeaver'
+      version: '4.006'
+    -
+      class: Dist::Zilla::Plugin::GithubMeta
+      name: '@RJBS/GithubMeta'
+      version: '0.46'
+    -
+      class: Dist::Zilla::Plugin::Git::Check
+      config:
+        Dist::Zilla::Plugin::Git::Check:
+          untracked_files: die
+        Dist::Zilla::Role::Git::DirtyFiles:
+          allow_dirty:
+            - dist.ini
+            - Changes
+          allow_dirty_match: []
+          changelog: Changes
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@RJBS/@Git/Check'
+      version: '2.024'
+    -
+      class: Dist::Zilla::Plugin::Git::Commit
+      config:
+        Dist::Zilla::Plugin::Git::Commit:
+          add_files_in: []
+          commit_msg: v%v%n%n%c
+          time_zone: local
+        Dist::Zilla::Role::Git::DirtyFiles:
+          allow_dirty:
+            - dist.ini
+            - Changes
+          allow_dirty_match: []
+          changelog: Changes
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@RJBS/@Git/Commit'
+      version: '2.024'
+    -
+      class: Dist::Zilla::Plugin::Git::Tag
+      config:
+        Dist::Zilla::Plugin::Git::Tag:
+          branch: ~
+          signed: 0
+          tag: '0.859'
+          tag_format: '%v'
+          tag_message: v%v
+          time_zone: local
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@RJBS/@Git/Tag'
+      version: '2.024'
+    -
+      class: Dist::Zilla::Plugin::Git::Push
+      config:
+        Dist::Zilla::Plugin::Git::Push:
+          push_to:
+            - 'origin :'
+            - 'github :'
+          remotes_must_exist: 0
+        Dist::Zilla::Role::Git::Repo:
+          repo_root: .
+      name: '@RJBS/@Git/Push'
+      version: '2.024'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':InstallModules'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':IncModules'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':TestFiles'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':ExecFiles'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':ShareFiles'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':MainModule'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':AllFiles'
+      version: '5.020'
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':NoFiles'
+      version: '5.020'
+  zilla:
+    class: Dist::Zilla::Dist::Builder
+    config:
+      is_trial: '0'
+    version: '5.020'
@@ -1,14 +1,67 @@
+
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.020.
 use strict;
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
-  NAME          => 'Email::Folder',
-  VERSION_FROM  => 'lib/Email/Folder.pm',
-  (eval { ExtUtils::MakeMaker->VERSION(6.21) } ? (LICENSE => 'perl') : ()),
-  PREREQ_PM     => {
-    'Email::FolderType' => 0.6, # or Ezmlm
-    'Email::Simple' => 0,
-    'Test::More'    => '0.47',
+use warnings;
+
+
+
+use ExtUtils::MakeMaker ;
+
+
+
+my %WriteMakefileArgs = (
+  "ABSTRACT" => "read all the messages from a folder as Email::Simple objects",
+  "AUTHOR" => "Simon Wistow <simon\@thegestalt.org>, Richard Clamp <richardc\@unixbeard.net>",
+  "CONFIGURE_REQUIRES" => {
+    "ExtUtils::MakeMaker" => 0
+  },
+  "DISTNAME" => "Email-Folder",
+  "EXE_FILES" => [],
+  "LICENSE" => "perl",
+  "NAME" => "Email::Folder",
+  "PREREQ_PM" => {
+    "Carp" => 0,
+    "Email::FolderType" => "0.6",
+    "Email::Simple" => 0,
+    "IO::File" => 0,
+    "constant" => 0,
+    "parent" => 0,
+    "strict" => 0,
+    "warnings" => 0
+  },
+  "TEST_REQUIRES" => {
+    "Test::More" => "0.96"
   },
+  "VERSION" => "0.859",
+  "test" => {
+    "TESTS" => "t/*.t"
+  }
 );
 
+
+my %FallbackPrereqs = (
+  "Carp" => 0,
+  "Email::FolderType" => "0.6",
+  "Email::Simple" => 0,
+  "IO::File" => 0,
+  "Test::More" => "0.96",
+  "constant" => 0,
+  "parent" => 0,
+  "strict" => 0,
+  "warnings" => 0
+);
+
+
+unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
+  delete $WriteMakefileArgs{TEST_REQUIRES};
+  delete $WriteMakefileArgs{BUILD_REQUIRES};
+  $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
+}
+
+delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+  unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+
+WriteMakefile(%WriteMakefileArgs);
+
+
+
@@ -1,66 +1,15 @@
-NAME
-    Email::Folder - read all the messages from a folder as Email::Simple
-    objects.
 
-SYNOPSIS
-     use Email::Folder;
 
-     my $folder = Email::Folder->new("some_file");
+This archive contains the distribution Email-Folder,
+version 0.859:
 
-     print join "\n", map { $_->header("Subject") } $folder->messages;
+  read all the messages from a folder as Email::Simple objects
 
-METHODS
-  new($folder, %options)
-    Takes the name of a folder, and a hash of options
+This software is copyright (c) 2006 by Simon Wistow.
 
-    If a 'reader' option is passed in then that is used as the class to read
-    in messages with.
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
-  messages
-    Returns a list containing all of the messages in the folder. Can only be
-    called once as it drains the iterator.
 
-  next_message
-    acts as an iterator. reads the next message from a folder. returns false
-    at the end of the folder
-
-  bless_message($message)
-    Takes a raw RFC822 message and blesses it into a class.
-
-    By default this is an Email::Simple object but can easily be overriden
-    in a subclass.
-
-    For example, this simple subclass just returns the raw rfc822 messages,
-    and exposes the speed of the parser.
-
-     package Email::RawFolder;
-     use base 'Email::Folder';
-     sub bless_message { $_[1] };
-     1;
-
-  reader
-    read-only accessor to the underlying Email::Reader subclass instance
-
-AUTHORS
-    Simon Wistow <simon@thegestalt.org>
-
-    Richard Clamp <richardc@unixbeard.net>
-
-COPYING
-    Copyright 2006, Simon Wistow
-
-    Distributed under the same terms as Perl itself.
-
-    This software is under no warranty and will probably ruin your life,
-    kill your friends, burn your house and bring about the doobie brothers.
-
-SUPPORT
-    This module is part of the Perl Email Project - http://pep.kwiki.org/
-
-    There is a mailing list at pep@perl.org (subscribe at
-    pep-subscribe@perl.org) and an archive available at
-    http://nntp.perl.org/group/pep.php
-
-SEE ALSO
-    Email::LocalDelivery, Email::FolderType, Email::Simple
+This README file was generated by Dist::Zilla::Plugin::Readme v5.020.
 
@@ -0,0 +1,8 @@
+name    = Email-Folder
+author  = Simon Wistow <simon@thegestalt.org>
+author  = Richard Clamp <richardc@unixbeard.net>
+license = Perl_5
+copyright_holder = Simon Wistow
+copyright_year   = 2006
+
+[@RJBS]
@@ -1,8 +1,11 @@
-package Email::Folder::Ezmlm;
 use strict;
+use warnings;
+package Email::Folder::Ezmlm;
+# ABSTRACT: reads raw RFC822 mails from an ezmlm archive
+$Email::Folder::Ezmlm::VERSION = '0.859';
 use Carp;
 use Email::Folder::Maildir;
-use base 'Email::Folder::Maildir';
+use parent 'Email::Folder::Maildir';
 
 # we're a little complicit, just redefining an internal method, but
 # that's fine, we maintain both piles :)
@@ -26,3 +29,40 @@ sub _what_is_there {
 }
 
 1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Email::Folder::Ezmlm - reads raw RFC822 mails from an ezmlm archive
+
+=head1 VERSION
+
+version 0.859
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+Simon Wistow <simon@thegestalt.org>
+
+=item *
+
+Richard Clamp <richardc@unixbeard.net>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2006 by Simon Wistow.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
@@ -1,23 +1,22 @@
-package Email::Folder::MH;
 use strict;
+use warnings;
+package Email::Folder::MH;
+# ABSTRACT: reads raw RFC822 mails from an mh folder
+$Email::Folder::MH::VERSION = '0.859';
 use Carp;
 use IO::File;
 use Email::Folder::Reader;
-use base 'Email::Folder::Reader';
-
-=head1 NAME
-
-Email::Folder::MH - reads raw RFC822 mails from an mh folder
-
-=head1 SYNOPSIS
-
-This isa Email::Folder::Reader - read about its API there.
-
-=head1 DESCRIPTION
-
-It's yet another email folder reader!  It reads MH folders.
-
-=cut
+use parent 'Email::Folder::Reader';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod This isa Email::Folder::Reader - read about its API there.
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod It's yet another email folder reader!  It reads MH folders.
+#pod
+#pod =cut
 
 sub _what_is_there {
     my $self = shift;
@@ -29,8 +28,12 @@ sub _what_is_there {
     my @messages;
                 opendir(DIR,"$dir") or croak "Could not open '$dir'";
                 foreach my $file (readdir DIR) {
+                    if ($^O eq 'VMS'){
+                        next unless $file =~ /\A\d+\.\Z/;
+                    } else {
                         next unless $file =~ /\A\d+\Z/;
-                                push @messages, "$dir/$file";
+                    }
+                    push @messages, "$dir/$file";
                 }
 
     $self->{_messages} = \@messages;
@@ -50,20 +53,45 @@ sub next_message {
 
 __END__
 
-=head1 AUTHOR
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Email::Folder::MH - reads raw RFC822 mails from an mh folder
+
+=head1 VERSION
+
+version 0.859
+
+=head1 SYNOPSIS
+
+This isa Email::Folder::Reader - read about its API there.
+
+=head1 DESCRIPTION
+
+It's yet another email folder reader!  It reads MH folders.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
 
-Ricardo SIGNES <C<rjbs@cpan.org>>
+Simon Wistow <simon@thegestalt.org>
 
-This code is just Simon Wistow's Email::Folder::Maildir adapted for C<mh>.
+=item *
 
-=head1 COPYING
+Richard Clamp <richardc@unixbeard.net>
 
-Copyright 2004, Simon Wistow
+=back
 
-Distributed under the same terms as Perl itself.
+=head1 COPYRIGHT AND LICENSE
 
-=head1 SEE ALSO
+This software is copyright (c) 2006 by Simon Wistow.
 
-L<Email::LocalDelivery>, L<Email::Folder>
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
@@ -1,26 +1,26 @@
-package Email::Folder::Maildir;
 use strict;
+use warnings;
+package Email::Folder::Maildir;
+# ABSTRACT: reads raw RFC822 mails from a maildir
+$Email::Folder::Maildir::VERSION = '0.859';
 use Carp;
 use IO::File;
 use Email::Folder::Reader;
-use base 'Email::Folder::Reader';
-
-=head1 NAME
-
-Email::Folder::Maildir - reads raw RFC822 mails from a maildir
-
-=head1 SYNOPSIS
-
-This isa Email::Folder::Reader - read about its API there.
-
-=head1 DESCRIPTION
-
-Does exactly what it says on the tin - fetches raw RFC822 mails from a
-maildir.
-
-The maildir format is described at http://www.qmail.org/man/man5/maildir.html
-
-=cut
+use parent 'Email::Folder::Reader';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod This isa Email::Folder::Reader - read about its API there.
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod Does exactly what it says on the tin - fetches raw RFC822 mails from a
+#pod maildir.
+#pod
+#pod The maildir format is described at
+#pod L<http://www.qmail.org/man/man5/maildir.html>
+#pod
+#pod =cut
 
 sub _what_is_there {
     my $self = shift;
@@ -59,20 +59,49 @@ sub next_message {
 
 __END__
 
-=head1 AUTHOR
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Email::Folder::Maildir - reads raw RFC822 mails from a maildir
+
+=head1 VERSION
+
+version 0.859
+
+=head1 SYNOPSIS
+
+This isa Email::Folder::Reader - read about its API there.
+
+=head1 DESCRIPTION
+
+Does exactly what it says on the tin - fetches raw RFC822 mails from a
+maildir.
+
+The maildir format is described at
+L<http://www.qmail.org/man/man5/maildir.html>
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
 
 Simon Wistow <simon@thegestalt.org>
 
-=head1 COPYING
+=item *
 
-Copyright 2003, Simon Wistow
+Richard Clamp <richardc@unixbeard.net>
 
-Distributed under the same terms as Perl itself.
+=back
 
-This software is under no warranty and will probably ruin your life, kill your friends, burn your house and brin$
+=head1 COPYRIGHT AND LICENSE
 
-=head1 SEE ALSO
+This software is copyright (c) 2006 by Simon Wistow.
 
-L<Email::LocalDelivery>, L<Email::Folder>
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
@@ -1,88 +1,114 @@
-package Email::Folder::Mbox;
 use strict;
+use warnings;
+package Email::Folder::Mbox;
+# ABSTRACT: reads raw RFC822 mails from an mbox file
+$Email::Folder::Mbox::VERSION = '0.859';
 use Carp;
 use IO::File;
 use Email::Folder::Reader;
-use base 'Email::Folder::Reader';
-
-=head1 NAME
-
-Email::Folder::Mbox - reads raw RFC822 mails from an mbox file
-
-=head1 SYNOPSIS
-
-This isa Email::Folder::Reader - read about its API there.
-
-=head1 DESCRIPTION
-
-Does exactly what it says on the tin - fetches raw RFC822 mails from an
-mbox.
-
-The mbox format is described at http://www.qmail.org/man/man5/mbox.html
-
-We attempt to read an mbox as through it's the mboxcl2 variant,
-falling back to regular mbox mode if there is no C<Content-Length>
-header to be found.
-
-=head2 OPTIONS
-
-The new constructor takes extra options.
-
-=over
-
-=item C<eol>
-
-This indicates what the line-ending style is to be.  The default is
-C<"\n">, but for handling files with mac line-endings you would want
-to specify C<eol =E<gt> "\x0d">
-
-=item C<jwz_From_>
-
-The value is taken as a boolean that governs what is used match as a
-message seperator.
-
-If false we use the mutt style
-
- /^From \S+\s+(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/
- /^From (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/;
-
-If true we use
-
- /^From /
-
-In deference to this extract from L<http://www.jwz.org/doc/content-length.html>
-
- Essentially the only safe way to parse that file format is to
- consider all lines which begin with the characters ``From ''
- (From-space), which are preceded by a blank line or
- beginning-of-file, to be the division between messages.  That is, the
- delimiter is "\n\nFrom .*\n" except for the very first message in the
- file, where it is "^From .*\n".
-
- Some people will tell you that you should do stricter parsing on
- those lines: check for user names and dates and so on.  They are
- wrong.  The random crap that has traditionally been dumped into that
- line is without bound; comparing the first five characters is the
- only safe and portable thing to do. Usually, but not always, the next
- token on the line after ``From '' will be a user-id, or email
- address, or UUCP path, and usually the next thing on the line will be
- a date specification, in some format, and usually there's nothing
- after that.  But you can't rely on any of this.
-
-Defaults to false.
-
-=item C<seek_to>
-
-Seek to an offset when opening the mbox.  When used in combination with
-->tell you may be able to resume reading, with a trailing wind.
-
-=item C<tell>
-
-This returns the current filehandle position in the mbox.
-
-=back
-
-=cut
+use parent 'Email::Folder::Reader';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod This isa Email::Folder::Reader - read about its API there.
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod Does exactly what it says on the tin - fetches raw RFC822 mails from an
+#pod mbox.
+#pod
+#pod The mbox format is described at http://www.qmail.org/man/man5/mbox.html
+#pod
+#pod We attempt to read an mbox as through it's the mboxcl2 variant,
+#pod falling back to regular mbox mode if there is no C<Content-Length>
+#pod header to be found.
+#pod
+#pod =head2 OPTIONS
+#pod
+#pod The new constructor takes extra options.
+#pod
+#pod =over
+#pod
+#pod =item C<fh>
+#pod
+#pod When filename is set to C<"FH"> than Email::Folder::Mbox will read mbox
+#pod archive from filehandle C<fh> instead from disk file C<filename>.
+#pod
+#pod =item C<eol>
+#pod
+#pod This indicates what the line-ending style is to be.  The default is
+#pod C<"\n">, but for handling files with mac line-endings you would want
+#pod to specify C<eol =E<gt> "\x0d">
+#pod
+#pod =item C<jwz_From_>
+#pod
+#pod The value is taken as a boolean that governs what is used match as a
+#pod message separator.
+#pod
+#pod If false we use the mutt style
+#pod
+#pod  /^From \S+\s+(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/
+#pod  /^From (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/;
+#pod
+#pod If true we use
+#pod
+#pod  /^From /
+#pod
+#pod In deference to this extract from L<http://www.jwz.org/doc/content-length.html>
+#pod
+#pod   Essentially the only safe way to parse that file format is to
+#pod   consider all lines which begin with the characters ``From ''
+#pod   (From-space), which are preceded by a blank line or
+#pod   beginning-of-file, to be the division between messages.  That is, the
+#pod   delimiter is "\n\nFrom .*\n" except for the very first message in the
+#pod   file, where it is "^From .*\n".
+#pod
+#pod   Some people will tell you that you should do stricter parsing on
+#pod   those lines: check for user names and dates and so on.  They are
+#pod   wrong.  The random crap that has traditionally been dumped into that
+#pod   line is without bound; comparing the first five characters is the
+#pod   only safe and portable thing to do. Usually, but not always, the next
+#pod   token on the line after ``From '' will be a user-id, or email
+#pod   address, or UUCP path, and usually the next thing on the line will be
+#pod   a date specification, in some format, and usually there's nothing
+#pod   after that.  But you can't rely on any of this.
+#pod
+#pod Defaults to false.
+#pod
+#pod =item C<unescape>
+#pod
+#pod This boolean value indicates whenever lines which starts with
+#pod
+#pod  /^>+From /
+#pod
+#pod should be unescaped (= removed leading '>' char). This is needed for
+#pod mboxrd and mboxcl variants. But there is no way to detect for used mbox
+#pod variant, so default value is false.
+#pod
+#pod =item C<seek_to>
+#pod
+#pod Seek to an offset when opening the mbox.  When used in combination with
+#pod ->tell you may be able to resume reading, with a trailing wind.
+#pod
+#pod =item <next_message>
+#pod
+#pod This returns next message as string
+#pod
+#pod =item <next_messageref>
+#pod
+#pod This returns next message as ref to string
+#pod
+#pod =item C<tell>
+#pod
+#pod This returns the current filehandle position in the mbox.
+#pod
+#pod =item C<next_from>
+#pod
+#pod This returns the From_ line for next message. Call it before ->next_message.
+#pod
+#pod =back
+#pod
+#pod =cut
 
 sub defaults {
     ( eol => "\n")
@@ -91,23 +117,39 @@ sub defaults {
 sub _open_it {
     my $self = shift;
     my $file = $self->{_file};
+    my $fh = $self->{fh};
 
-    # sanity checking
-    croak "$file does not exist" unless (-e $file);
-    croak "$file is not a file"  unless (-f $file);
+    unless ($file eq "FH" and $fh) {
+        # sanity checking
+        croak "$file does not exist" unless (-e $file);
+        croak "$file is not a file"  unless (-f $file);
 
-    local $/ = $self->{eol};
-    my $fh = $self->_get_fh($file);
+        local $/ = $self->{eol};
+        $fh = $self->_get_fh($file);
+    }
+
+    if (seek $fh, tell($fh), 0) {
+        # Enable using seek only if $fh is seekable
+        $self->{seekable} = 1;
+    } else {
+        # Otherwise use cache for simulating backward seeks
+        $self->{cache} = [];
+    }
 
     if ($self->{seek_to}) {
+        unless ($self->{seekable}) {
+            croak "$file is not seekable but seek_to was set";
+        }
         # we were told to seek.  hope it all goes well
         seek $fh, $self->{seek_to}, 0;
     }
     else {
+        local $/ = $self->{eol};
         my $firstline = <$fh>;
         if ($firstline) {
             croak "$file is not an mbox file" unless $firstline =~ /^From /;
         }
+        $self->{from} = $firstline;
     }
 
     $self->{_fh} = $fh;
@@ -121,10 +163,25 @@ sub _get_fh {
     return $fh;
 }
 
+sub _read_nextline {
+    my $self = shift;
+    if (not $self->{seekable} and @{$self->{cache}}) {
+        return shift @{$self->{cache}};
+    }
+    my $fh = $self->{_fh};
+    return <$fh>;
+}
+
 use constant debug => 0;
 my $count;
 
-sub next_message {
+sub next_from {
+    my $self = shift;
+    $self->_open_it unless $self->{_fh};
+    return $self->{from};
+}
+
+sub next_messageref {
     my $self = shift;
 
     my $fh = $self->{_fh} || $self->_open_it;
@@ -132,62 +189,111 @@ sub next_message {
 
     my $mail = '';
     my $prev = '';
+    my $last;
     my $inheaders = 1;
     ++$count;
     print "$count starting scanning at line $.\n" if debug;
 
-    while (my $line = <$fh>) {
+    while (my $line = _read_nextline($self)) {
         if ($line eq $/ && $inheaders) { # end of headers
             print "$count end of headers at line $.\n" if debug;
             $inheaders = 0; # stop looking for the end of headers
-            my $pos = tell $fh; # where to go back to if it goes wrong
+            my $pos; # where to go back to if it goes wrong
+            $pos = tell $fh if $self->{seekable};
 
             # look for a content length header, and try to use that
-            if ($mail =~ m/^Content-Length: (\d+)$/mi) {
+            if ($mail =~ m/^Content-Length:\s*(\d+)$/mi) {
+                my @cache;
                 $mail .= $prev;
+                $prev = '';
                 my $length = $1;
                 print " Content-Length: $length\n" if debug;
                 my $read = '';
-                while (my $bodyline = <$fh>) {
+                while (my $bodyline = _read_nextline($self)) {
+                    push @cache, $bodyline unless $self->{seekable};
                     last if length $read >= $length;
+                    # unescape From_
+                    $bodyline =~ s/^>(>*From )/$1/ if $self->{unescape};
                     $read .= $bodyline;
                 }
                 # grab the next line (should be /^From / or undef)
-                my $next = <$fh>;
-                return "$mail$/$read"
-                  if !defined $next || $next =~ /^From /;
+                my $next = _read_nextline($self);
+                if (!defined $next || $next =~ /^From /) {
+                    $self->{from} = $next;
+                    $mail .= "$/$read";
+                    return \$mail;
+                }
+                push @cache, $next unless $self->{seekable};
                 # seek back and scan line-by-line like the header
                 # wasn't here
                 print " Content-Length assertion failed '$next'\n" if debug;
-                seek $fh, $pos, 0;
+                if ($self->{seekable}) {
+                    seek $fh, $pos, 0;
+                }
+                else {
+                    unshift @{$self->{cache}}, @cache;
+                }
             }
 
             # much the same, but with Lines:
-            if ($mail =~ m/^Lines: (\d+)$/mi) {
+            if ($mail =~ m/^Lines:\s*(\d+)$/mi) {
+                my @cache;
                 $mail .= $prev;
+                $prev = '';
                 my $lines = $1;
                 print " Lines: $lines\n" if debug;
                 my $read = '';
-                for (1 .. $lines) { $read .= <$fh> }
-                <$fh>; # trailing newline
-                my $next = <$fh>;
-                return "$mail$/$read"
-                  if !defined $next || $next =~ /^From /;
+                for (1 .. $lines) {
+                    my $bodyline = _read_nextline($self);
+                    last unless defined $bodyline;
+                    push @cache, $bodyline unless $self->{seekable};
+                    # unescape From_
+                    $bodyline =~ s/^>(>*From )/$1/ if $self->{unescape};
+                    $read .= $bodyline;
+                }
+                my $ign = _read_nextline($self); # trailing newline
+                my $next = _read_nextline($self);
+                if (!defined $next || $next =~ /^From /) {
+                    $self->{from} = $next;
+                    $mail .= "$/$read";
+                    return \$mail;
+                }
+                push @cache, $ign, $next unless $self->{seekable};
                 # seek back and scan line-by-line like the header
                 # wasn't here
                 print " Lines assertion failed '$next'\n" if debug;
-                seek $fh, $pos, 0;
+                if ($self->{seekable}) {
+                    seek $fh, $pos, 0;
+                }
+                else {
+                    unshift @{$self->{cache}}, @cache;
+                }
             }
         }
 
-        last if $prev eq $/ && ($line =~ $self->_from_line_re);
+        if ($prev eq $/ && ($line =~ $self->_from_line_re)) {
+            $mail .= $prev;
+            $last = $line;
+            last;
+        }
 
         $mail .= $prev;
         $prev = $line;
+
+        # unescape From_
+        $prev =~ s/^>(>*From )/$1/ if $self->{unescape};
     }
     print "$count end of message line $.\n" if debug;
+    $self->{from} = $last;
     return unless $mail;
-    return $mail;
+    return \$mail;
+}
+
+sub next_message {
+    my $self = shift;
+    my $ref = $self->next_messageref;
+    return unless $ref;
+    return ${$ref};
 }
 
 my @FROM_RE;
@@ -216,23 +322,137 @@ sub tell {
 
 __END__
 
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Email::Folder::Mbox - reads raw RFC822 mails from an mbox file
+
+=head1 VERSION
+
+version 0.859
+
+=head1 SYNOPSIS
+
+This isa Email::Folder::Reader - read about its API there.
+
+=head1 DESCRIPTION
+
+Does exactly what it says on the tin - fetches raw RFC822 mails from an
+mbox.
+
+The mbox format is described at http://www.qmail.org/man/man5/mbox.html
+
+We attempt to read an mbox as through it's the mboxcl2 variant,
+falling back to regular mbox mode if there is no C<Content-Length>
+header to be found.
+
+=head2 OPTIONS
+
+The new constructor takes extra options.
+
+=over
+
+=item C<fh>
+
+When filename is set to C<"FH"> than Email::Folder::Mbox will read mbox
+archive from filehandle C<fh> instead from disk file C<filename>.
+
+=item C<eol>
+
+This indicates what the line-ending style is to be.  The default is
+C<"\n">, but for handling files with mac line-endings you would want
+to specify C<eol =E<gt> "\x0d">
+
+=item C<jwz_From_>
+
+The value is taken as a boolean that governs what is used match as a
+message separator.
+
+If false we use the mutt style
+
+ /^From \S+\s+(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/
+ /^From (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)/;
+
+If true we use
+
+ /^From /
+
+In deference to this extract from L<http://www.jwz.org/doc/content-length.html>
+
+  Essentially the only safe way to parse that file format is to
+  consider all lines which begin with the characters ``From ''
+  (From-space), which are preceded by a blank line or
+  beginning-of-file, to be the division between messages.  That is, the
+  delimiter is "\n\nFrom .*\n" except for the very first message in the
+  file, where it is "^From .*\n".
+
+  Some people will tell you that you should do stricter parsing on
+  those lines: check for user names and dates and so on.  They are
+  wrong.  The random crap that has traditionally been dumped into that
+  line is without bound; comparing the first five characters is the
+  only safe and portable thing to do. Usually, but not always, the next
+  token on the line after ``From '' will be a user-id, or email
+  address, or UUCP path, and usually the next thing on the line will be
+  a date specification, in some format, and usually there's nothing
+  after that.  But you can't rely on any of this.
+
+Defaults to false.
+
+=item C<unescape>
+
+This boolean value indicates whenever lines which starts with
+
+ /^>+From /
+
+should be unescaped (= removed leading '>' char). This is needed for
+mboxrd and mboxcl variants. But there is no way to detect for used mbox
+variant, so default value is false.
+
+=item C<seek_to>
+
+Seek to an offset when opening the mbox.  When used in combination with
+->tell you may be able to resume reading, with a trailing wind.
+
+=item <next_message>
+
+This returns next message as string
+
+=item <next_messageref>
+
+This returns next message as ref to string
+
+=item C<tell>
+
+This returns the current filehandle position in the mbox.
+
+=item C<next_from>
+
+This returns the From_ line for next message. Call it before ->next_message.
+
+=back
+
 =head1 AUTHORS
 
-Simon Wistow <simon@thegestalt.org>
+=over 4
 
-Richard Clamp <richardc@unixbeard.net>
+=item *
 
-=head1 COPYING
+Simon Wistow <simon@thegestalt.org>
 
-Copyright 2003, Simon Wistow
+=item *
 
-Distributed under the same terms as Perl itself.
+Richard Clamp <richardc@unixbeard.net>
+
+=back
 
-This software is under no warranty and will probably ruin your life,
-kill your friends, burn your house and bring about the apocolapyse.
+=head1 COPYRIGHT AND LICENSE
 
-=head1 SEE ALSO
+This software is copyright (c) 2006 by Simon Wistow.
 
-L<Email::LocalDelivery>, L<Email::Folder>
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
@@ -1,11 +1,81 @@
-package Email::Folder::Reader;
 use strict;
+use warnings;
+package Email::Folder::Reader;
+# ABSTRACT: reads raw RFC822 mails from a box
+$Email::Folder::Reader::VERSION = '0.859';
 use Carp;
 
+#pod =head1 SYNOPSIS
+#pod
+#pod  use Email::Folder::Reader;
+#pod  my $box = Email::Folder::Reader->new('somebox');
+#pod  print $box->messages;
+#pod
+#pod or, as an iterator
+#pod
+#pod  use Email::Folder::Reader;
+#pod  my $box = Email::Folder::Reader->new('somebox');
+#pod  while ( my $mail = $box->next_message ) {
+#pod      print $mail;
+#pod  }
+#pod
+#pod =head1 METHODS
+#pod
+#pod =head2 new($filename, %options)
+#pod
+#pod your standard class-method constructor
+#pod
+#pod =cut
+
+sub new {
+    my $class = shift;
+    my $file  = shift || croak "You must pass a filename";
+    bless { eval { $class->defaults },
+            @_,
+            _file => $file }, $class;
+}
+
+#pod =head2 ->next_message
+#pod
+#pod returns the next message from the box, or false if there are no more
+#pod
+#pod =cut
+
+sub next_message {
+}
+
+#pod =head2 ->messages
+#pod
+#pod Returns all the messages in a box
+#pod
+#pod =cut
+
+sub messages {
+    my $self = shift;
+
+    my @messages;
+    while (my $message = $self->next_message) {
+        push @messages, $message;
+    }
+    return @messages;
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
 =head1 NAME
 
 Email::Folder::Reader - reads raw RFC822 mails from a box
 
+=head1 VERSION
+
+version 0.859
+
 =head1 SYNOPSIS
 
  use Email::Folder::Reader;
@@ -22,64 +92,37 @@ or, as an iterator
 
 =head1 METHODS
 
-=head2 ->new($filename, %options)
+=head2 new($filename, %options)
 
 your standard class-method constructor
 
-=cut
-
-sub new {
-    my $class = shift;
-    my $file  = shift || croak "You must pass a filename";
-    bless { eval { $class->defaults },
-            @_,
-            _file => $file }, $class;
-}
-
 =head2 ->next_message
 
 returns the next message from the box, or false if there are no more
 
-=cut
-
-sub next_message {
-}
-
 =head2 ->messages
 
 Returns all the messages in a box
 
-=cut
-
-sub messages {
-    my $self = shift;
+=head1 AUTHORS
 
-    my @messages;
-    while (my $message = $self->next_message) {
-        push @messages, $message;
-    }
-    return @messages;
-}
-
-1;
-
-__END__
+=over 4
 
-=head1 AUTHOR
+=item *
 
 Simon Wistow <simon@thegestalt.org>
 
-=head1 COPYING
+=item *
 
-Copyright 2003, Simon Wistow
+Richard Clamp <richardc@unixbeard.net>
 
-Distributed under the same terms as Perl itself.
+=back
 
-This software is under no warranty and will probably ruin your life,
-kill your friends, burn your house and bring about the apocolapyse.
+=head1 COPYRIGHT AND LICENSE
 
-=head1 SEE ALSO
+This software is copyright (c) 2006 by Simon Wistow.
 
-L<Email::LocalDelivery>, L<Email::Folder>
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
 
 =cut
@@ -1,34 +1,30 @@
 use strict;
+use warnings;
 package Email::Folder;
+# ABSTRACT: read all the messages from a folder as Email::Simple objects
+$Email::Folder::VERSION = '0.859';
 use Carp;
 use Email::Simple;
-use Email::FolderType qw/folder_type/;
-
-use vars qw($VERSION);
-$VERSION = "0.855";
-
-=head1 NAME
-
-Email::Folder - read all the messages from a folder as Email::Simple objects.
-
-=head1 SYNOPSIS
-
- use Email::Folder;
-
- my $folder = Email::Folder->new("some_file");
-
- print join "\n", map { $_->header("Subject") } $folder->messages;
-
-=head1 METHODS
-
-=head2 new($folder, %options)
-
-Takes the name of a folder, and a hash of options
-
-If a 'reader' option is passed in then that is
-used as the class to read in messages with.
-
-=cut
+use Email::FolderType 0.6 qw/folder_type/;
+
+#pod =head1 SYNOPSIS
+#pod
+#pod  use Email::Folder;
+#pod
+#pod  my $folder = Email::Folder->new("some_file");
+#pod
+#pod  print join "\n", map { $_->header("Subject") } $folder->messages;
+#pod
+#pod =head1 METHODS
+#pod
+#pod =head2 new($folder, %options)
+#pod
+#pod Takes the name of a folder, and a hash of options
+#pod
+#pod If a 'reader' option is passed in then that is
+#pod used as the class to read in messages with.
+#pod
+#pod =cut
 
 sub new {
     my $class  = shift;
@@ -49,12 +45,12 @@ sub new {
     return bless \%self, $class;
 }
 
-=head2 messages
-
-Returns a list containing all of the messages in the folder.  Can only
-be called once as it drains the iterator.
-
-=cut
+#pod =head2 messages
+#pod
+#pod Returns a list containing all of the messages in the folder.  Can only
+#pod be called once as it drains the iterator.
+#pod
+#pod =cut
 
 sub messages {
     my $self = shift;
@@ -68,12 +64,12 @@ sub messages {
 }
 
 
-=head2 next_message
-
-acts as an iterator.  reads the next message from a folder.  returns
-false at the end of the folder
-
-=cut
+#pod =head2 next_message
+#pod
+#pod acts as an iterator.  reads the next message from a folder.  returns
+#pod false at the end of the folder
+#pod
+#pod =cut
 
 sub next_message {
     my $self = shift;
@@ -83,22 +79,22 @@ sub next_message {
 }
 
 
-=head2 bless_message($message)
-
-Takes a raw RFC822 message and blesses it into a class.
-
-By default this is an Email::Simple object but can easily be overriden
-in a subclass.
-
-For example, this simple subclass just returns the raw rfc822 messages,
-and exposes the speed of the parser.
-
- package Email::RawFolder;
- use base 'Email::Folder';
- sub bless_message { $_[1] };
- 1;
-
-=cut
+#pod =head2 bless_message($message)
+#pod
+#pod Takes a raw RFC822 message and blesses it into a class.
+#pod
+#pod By default this is an Email::Simple object but can easily be overridden
+#pod in a subclass.
+#pod
+#pod For example, this simple subclass just returns the raw rfc822 messages,
+#pod and exposes the speed of the parser.
+#pod
+#pod  package Email::RawFolder;
+#pod  use base 'Email::Folder';
+#pod  sub bless_message { $_[1] };
+#pod  1;
+#pod
+#pod =cut
 
 sub bless_message {
     my $self    = shift;
@@ -108,11 +104,11 @@ sub bless_message {
 }
 
 
-=head2 reader
-
-read-only accessor to the underlying Email::Reader subclass instance
-
-=cut
+#pod =head2 reader
+#pod
+#pod read-only accessor to the underlying Email::Reader subclass instance
+#pod
+#pod =cut
 
 sub reader {
     my $self = shift;
@@ -121,31 +117,95 @@ sub reader {
 
 1;
 
+#pod =head1 SEE ALSO
+#pod
+#pod L<Email::LocalDelivery>, L<Email::FolderType>, L<Email::Simple>
+#pod
+#pod =cut
+
 __END__
 
-=head1 PERL EMAIL PROJECT
+=pod
+
+=encoding UTF-8
 
-This module is maintained by the Perl Email Project
+=head1 NAME
 
-L<http://emailproject.perl.org/wiki/Email::Folder>
+Email::Folder - read all the messages from a folder as Email::Simple objects
 
-=head1 AUTHORS
+=head1 VERSION
 
-Simon Wistow <simon@thegestalt.org>
+version 0.859
 
-Richard Clamp <richardc@unixbeard.net>
+=head1 SYNOPSIS
 
-=head1 COPYING
+ use Email::Folder;
 
-Copyright 2006, Simon Wistow
+ my $folder = Email::Folder->new("some_file");
 
-Distributed under the same terms as Perl itself.
+ print join "\n", map { $_->header("Subject") } $folder->messages;
 
-This software is under no warranty and will probably ruin your life,
-kill your friends, burn your house and bring about the doobie brothers.
+=head1 METHODS
+
+=head2 new($folder, %options)
+
+Takes the name of a folder, and a hash of options
+
+If a 'reader' option is passed in then that is
+used as the class to read in messages with.
+
+=head2 messages
+
+Returns a list containing all of the messages in the folder.  Can only
+be called once as it drains the iterator.
+
+=head2 next_message
+
+acts as an iterator.  reads the next message from a folder.  returns
+false at the end of the folder
+
+=head2 bless_message($message)
+
+Takes a raw RFC822 message and blesses it into a class.
+
+By default this is an Email::Simple object but can easily be overridden
+in a subclass.
+
+For example, this simple subclass just returns the raw rfc822 messages,
+and exposes the speed of the parser.
+
+ package Email::RawFolder;
+ use base 'Email::Folder';
+ sub bless_message { $_[1] };
+ 1;
+
+=head2 reader
+
+read-only accessor to the underlying Email::Reader subclass instance
 
 =head1 SEE ALSO
 
 L<Email::LocalDelivery>, L<Email::FolderType>, L<Email::Simple>
 
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+Simon Wistow <simon@thegestalt.org>
+
+=item *
+
+Richard Clamp <richardc@unixbeard.net>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2006 by Simon Wistow.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
 =cut
@@ -0,0 +1,79 @@
+use strict;
+use warnings;
+use Test::More 0.88;
+# This is a relatively nice way to avoid Test::NoWarnings breaking our
+# expectations by adding extra tests, without using no_plan.  It also helps
+# avoid any other test module that feels introducing random tests, or even
+# test plans, is a nice idea.
+our $success = 0;
+END { $success && done_testing; }
+
+# List our own version used to generate this
+my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n";
+
+eval {                     # no excuses!
+    # report our Perl details
+    my $want = "any version";
+    $v .= "perl: $] (wanted $want) on $^O from $^X\n\n";
+};
+defined($@) and diag("$@");
+
+# Now, our module version dependencies:
+sub pmver {
+    my ($module, $wanted) = @_;
+    $wanted = " (want $wanted)";
+    my $pmver;
+    eval "require $module;";
+    if ($@) {
+        if ($@ =~ m/Can't locate .* in \@INC/) {
+            $pmver = 'module not found.';
+        } else {
+            diag("${module}: $@");
+            $pmver = 'died during require.';
+        }
+    } else {
+        my $version;
+        eval { $version = $module->VERSION; };
+        if ($@) {
+            diag("${module}: $@");
+            $pmver = 'died during VERSION check.';
+        } elsif (defined $version) {
+            $pmver = "$version";
+        } else {
+            $pmver = '<undef>';
+        }
+    }
+
+    # So, we should be good, right?
+    return sprintf('%-45s => %-10s%-15s%s', $module, $pmver, $wanted, "\n");
+}
+
+eval { $v .= pmver('Carp','any version') };
+eval { $v .= pmver('Email::FolderType','0.6') };
+eval { $v .= pmver('Email::Simple','any version') };
+eval { $v .= pmver('ExtUtils::MakeMaker','any version') };
+eval { $v .= pmver('IO::File','any version') };
+eval { $v .= pmver('Test::More','0.96') };
+eval { $v .= pmver('constant','any version') };
+eval { $v .= pmver('parent','any version') };
+eval { $v .= pmver('strict','any version') };
+eval { $v .= pmver('warnings','any version') };
+
+
+# All done.
+$v .= <<'EOT';
+
+Thanks for using my code.  I hope it works for you.
+If not, please try and include this output in the bug report.
+That will help me reproduce the issue and solve your problem.
+
+EOT
+
+diag($v);
+ok(1, "we really didn't test anything, just reporting data");
+$success = 1;
+
+# Work around another nasty module on CPAN. :/
+no warnings 'once';
+$Template::Test::NO_FLUSH = 1;
+exit 0;
@@ -13,7 +13,7 @@ use Test::More tests => 17 + 3 * keys %boxes;
 
 use_ok("Email::Folder");
 
-for my $box (keys %boxes) {
+for my $box (sort keys %boxes) {
   my $folder;
   ok(
     $folder = Email::Folder->new("t/mboxes/$box", eol => $boxes{$box}),
@@ -1,14 +0,0 @@
-#!perl -T
-
-use Test::More;
-
-plan skip_all => 'set RELEASE_TESTING to test pod' if ! $ENV{RELEASE_TESTING};
-
-eval "use Test::Pod::Coverage 1.08";
-plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage"
-  if $@;
-
-all_pod_coverage_ok({
-  coverage_class => 'Pod::Coverage::CountParents',
-  also_private   => [ qw(defaults) ],
-});
@@ -1,7 +0,0 @@
-#!perl -T
-
-use Test::More;
-plan skip_all => 'set RELEASE_TESTING to test pod' if ! $ENV{RELEASE_TESTING};
-eval "use Test::Pod 1.14";
-plan skip_all => "Test::Pod 1.14 required for testing POD" if $@;
-all_pod_files_ok();
diff --git a/var/tmp/source/RJBS/Email-Folder-0.855/Email-Folder-0.855/t/testmh/.mh_sequences b/var/tmp/source/RJBS/Email-Folder-0.855/Email-Folder-0.855/t/testmh/.mh_sequences
deleted file mode 100644
index e69de29b..00000000
@@ -0,0 +1,41 @@
+#!perl
+
+use Test::More tests => 2;
+
+note 'Checking Changes';
+my $changes_file = 'Changes';
+my $newver = '0.859';
+my $trial_token = '-TRIAL';
+
+SKIP: {
+    ok(-e $changes_file, "$changes_file file exists")
+        or skip 'Changes is missing', 1;
+
+    ok(_get_changes($newver), "$changes_file has content for $newver");
+}
+
+done_testing;
+
+# _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
+# by Jerome Quelin
+sub _get_changes
+{
+    my $newver = shift;
+
+    # parse changelog to find commit message
+    open(my $fh, '<', $changes_file) or die "cannot open $changes_file: $!";
+    my $changelog = join('', <$fh>);
+    close $fh;
+
+    my @content =
+        grep { /^$newver(?:$trial_token)?(?:\s+|$)/ ... /^\S/ } # from newver to un-indented
+        split /\n/, $changelog;
+    shift @content; # drop the version line
+
+    # drop unindented last line and trailing blank lines
+    pop @content while ( @content && $content[-1] =~ /^(?:\S|\s*$)/ );
+
+    # return number of non-blank lines
+    return scalar @content;
+}
+
@@ -0,0 +1,6 @@
+#!perl
+# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
+use Test::More;
+use Test::Pod 1.41;
+
+all_pod_files_ok();