diff --git a/BUG_IMAPClient_3.xx b/BUG_IMAPClient_3.xx
new file mode 100644
index 0000000..5826e11
--- /dev/null
+++ b/BUG_IMAPClient_3.xx
@@ -0,0 +1,9 @@
+
+
+BUGS found with Mail-IMAPClient-3.05/
+
+1) --ssl* bugs. 
+
+   30 timeout.
+
+2) --expunge2 does not expunge anything.
diff --git a/CREDITS b/CREDITS
index ff2a232..767e47e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -14,6 +14,23 @@ b) If you can read french, please use the following wishlist :
 
 c) its paypal account gilles.lamiral@laposte.net
 
+Blake Heinemann
+Contributed by giving the book
+"Perl Testing: A Developer's Notebook"
+
+Nathan Mills
+Contributed by giving the book
+"Mapping Hacks"
+
+Patrick Dayton (Medicus Insurance Compagny)
+Contributed by giving the book
+"Perl Hacks"
+
+
+Daniel Kohn
+Contributed by giving the book
+"Combinatorial Optimization: Algorithms and Complexity"
+
 
 Cvitkovich Andres
 Gave a patch to implement
diff --git a/ChangeLog b/ChangeLog
index 825358a..4ec1613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,50 @@
 
 RCS file: RCS/imapsync,v
 Working file: imapsync
-head: 1.241
+head: 1.249
 branch:
 locks: strict
-	gilles: 1.241
 access list:
 symbolic names:
 keyword substitution: kv
-total revisions: 241;	selected revisions: 241
+total revisions: 249;	selected revisions: 249
 description:
 ----------------------------
-revision 1.241	locked by: gilles;
+revision 1.249
+date: 2008/03/19 02:14:24;  author: gilles;  state: Exp;  lines: +7 -7
+warn about BUG_IMAPClient_3.xx
+----------------------------
+revision 1.248
+date: 2008/03/19 02:05:46;  author: gilles;  state: Exp;  lines: +14 -19
+Cleaned check_lib_version()
+----------------------------
+revision 1.247
+date: 2008/03/19 01:41:49;  author: gilles;  state: Exp;  lines: +1 -1
+Added id in output warn when no header found.
+----------------------------
+revision 1.246
+date: 2008/03/19 01:07:26;  author: gilles;  state: Exp;  lines: +19 -16
+Removed $^W use.
+----------------------------
+revision 1.245
+date: 2008/03/10 23:49:42;  author: gilles;  state: Exp;  lines: +53 -23
+Back to append_string()
+Turn on --syncinternaldates by default
+Date_Init("TZ=GMT") if no timezone (windows) set.
+----------------------------
+revision 1.244
+date: 2008/02/29 22:43:22;  author: gilles;  state: Exp;  lines: +5 -545
+Removed old *_2() functions (unused)
+----------------------------
+revision 1.243
+date: 2008/02/29 16:47:58;  author: gilles;  state: Exp;  lines: +632 -53
+Moved functins *_2() into override_imapclient()
+----------------------------
+revision 1.242
+date: 2008/02/29 00:28:15;  author: gilles;  state: Exp;  lines: +24 -13
+Ignore message when it has no header.
+----------------------------
+revision 1.241
 date: 2007/12/31 13:39:02;  author: gilles;  state: Exp;  lines: +6 -6
 Bug fix. --exclude and remove_from_requested_folders()
 ----------------------------
diff --git a/FAQ b/FAQ
index 5dd2581..37a0524 100644
--- a/FAQ
+++ b/FAQ
@@ -3,6 +3,21 @@
 | FAQ for imapsync |
 +------------------+
 
+=======================================================================
+Q. How to install impasync ?
+
+R. http://www.linux-france.org/prj/imapsync/INSTALL
+
+=======================================================================
+Q. How to configure impasync ?
+
+R. http://www.linux-france.org/prj/imapsync/README
+
+=======================================================================
+Q. Can you give some configuration examples ?
+
+R. http://www.linux-france.org/prj/imapsync/FAQ
+
 =======================================================================
 Q. Where I can read IMAP RFCs ?
 
@@ -26,6 +41,20 @@ Q. Where I can find old imapsync releases ?
 
 R. ftp://www.linux-france.org/pub/prj/imapsync/
 
+=======================================================================
+Q. imapsync does not work with Mail::IMAPClient 3.0.x
+   How can I downgrade to 2.2.9 release?
+
+R. - Download Mail::IMAPClient 2.2.9 at 
+   http://search.cpan.org/~djkernen/Mail-IMAPClient-2.2.9/
+   http://search.cpan.org/CPAN/authors/id/D/DJ/DJKERNEN/Mail-IMAPClient-2.2.9.tar.gz
+   - untar it anywhere:
+        tar xzvf Mail-IMAPClient-2.2.9.tar.gz
+   - run imapsync with perl and -I option tailing to use Mail-IMAPClient-2.2.9:
+        perl -I./Mail-IMAPClient-2.2.9 imapsync [...]
+     or if imapsync is in directory /path/
+        perl -I./Mail-IMAPClient-2.2.9 /path/imapsync [...]
+
 =======================================================================
 Q. We have found that the sent time and date have been changed to the 
    time at which the file was synchronised. 
@@ -122,6 +151,17 @@ The default hard datasize limit on FreeBSD is 512MB. To raise it, put this
 
 kern.maxdsiz="1024M"
 
+=======================================================================
+Q. With huge account (many messages) when it comes to reading the
+destination server it comes out this error:
+"To   Folder [INBOX.foobar] Not connected" 
+What can I do ?
+
+R. May be spending too much time on the source server, the connection 
+timed out on the destination server.
+Try options :
+  --nofoldersizes --useheader Message-ID --fast
+
 =======================================================================
 Q. imapsync failed with a "word too long" error from the imap server,
    What can I do ?
diff --git a/INSTALL b/INSTALL
index 578bb36..9832c18 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-# $Id: INSTALL,v 1.12 2007/10/30 00:49:03 gilles Exp gilles $
+# $Id: INSTALL,v 1.13 2008/03/19 00:28:36 gilles Exp gilles $
 # 
 # INSTALL file for imapsync 
 # imapsync : IMAP sync or copy tool.
@@ -42,12 +42,14 @@ Here is some individual module help:
 
   perl -mMail::IMAPClient -e 'print $Mail::IMAPClient::VERSION, "\n"'
 
+  New Mail-IMAPClient-3.xx doesn't work with imapsync for the moment.
+
 - Perl Digest::MD5 module. 
   http://search.cpan.org/
-  http://search.cpan.org/~gaas/Digest-MD5-2.33/
+  http://search.cpan.org/~gaas/Digest-MD5-2.36/
   To know the version you have on your system try :
   perl -mDigest::MD5 -e 'print $Digest::MD5::VERSION, "\n"'
-  I use 2.20 (debian package)
+  I use 2.36 (debian etch package)
 
 - Term::ReadKey
   perl -mTerm::ReadKey -e ''
@@ -94,7 +96,7 @@ titi@est.belle with a password located in the file /var/tmp/secret2
 
 Of course, you can change the file tests.sh and run the tests with :
 
-sh tests.sh
+sh -x tests.sh
 
 The tests.sh script break on first failure ("set -e" directive).
 
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.grammar b/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.grammar
deleted file mode 100755
index 100d3f8..0000000
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.grammar
+++ /dev/null
@@ -1,282 +0,0 @@
-# Directives
-# ( none)
-# Start-up Actions
-
-{
-	my $subpartCount = 0;
-	my $partCount    = 0;
-}
-
-# 
-# Atoms
-TEXT:		/^"TEXT"|^TEXT/i 	{ $return = "TEXT" }
-PLAIN:		/^"PLAIN"|^PLAIN/i 	{ $return = "PLAIN" }
-HTML:		/"HTML"|HTML/i 		{ $return = "HTML" }
-MESSAGE:	/^"MESSAGE"|^MESSAGE/i 	{ $return = "MESSAGE" 	}
-RFC822:		/^"RFC822"|^RFC822/i  	{ $return = "RFC822" 	}
-NIL:		/^NIL/i			{ $return = "NIL" 	}
-NUMBER:		/^(\d+)/		{ $return = $item[1]; $return||defined($return);}
-
-# 	Strings:
-
-SINGLE_QUOTED_STRING: "'" /(?:\\'|[^'])*/ "'" {
-
-	$return = $item{__PATTERN1__} ;
-	$return||defined($return);
-}
-
-DOUBLE_QUOTED_STRING: '"' /(?:\\"|[^"])*/ '"' {
-
-	 $return = $item{__PATTERN1__} ;
-	 $return||defined($return);
-}
-
-QUOTED_STRING: DOUBLE_QUOTED_STRING | SINGLE_QUOTED_STRING {
-
-	 $return = $item{DOUBLE_QUOTED_STRING}||$item{SINGLE_QUOTED_STRING} ;
-	 $return||defined($return);
-}
-
-BARESTRING: ...!/^[)('"]/	/^(?!\(|\))(?:\\ |\S)+/	{ 
-	$return = $item{__PATTERN1__} ; $return||defined($return);
-}
-
-STRING:	QUOTED_STRING | BARESTRING {
-	 $return = $item{QUOTED_STRING}||$item{BARESTRING} ;
-	 $return||defined($return);
-}
-
-OLDSTRING:         /^"((?:[^"\\]|\\.)*)"/ | /^([^ \(\)]+)/ 
-                        {       $item{__PATTERN1__} =~ s/^"(.*)"$/$1/;
-                                $return = $item{__PATTERN1__} || $item{__PATTERN2__} ;
-                                $return||defined($return);
-                        }
-
-#BARESTRING:	/^[^(]+\s+(?=\()/	
-#		{ $return = $item[1] ; $return||defined($return);}
-
-textlines:	NIL | NUMBER	{ $return = $item[1] || $item[2]; $return||defined($return); }
-rfc822message:  MESSAGE RFC822 	{ $return = "MESSAGE RFC822" }
-key:		STRING		{ $return = $item{STRING} ; $return||defined($return);}
-value:		NIL |  '(' <commit> kvpair(s) ')'| NUMBER | STRING 
-		{ 	$return = $item{NIL} 		|| 
-			$item{NUMBER} 			|| 
-			$item{STRING} 			|| 
-			{ map { (%$_) } @{$item{'kvpair(s)'}} } ;
-			$return||defined($return);
-		}
-kvpair:		...!")" key value 	
-		{ $return = { $item{key} => $item{value} }; $return||defined($return);}
-bodytype:	STRING		
-		{ $return = $item{STRING} ; $return||defined($return);}
-bodysubtype:	PLAIN | HTML | NIL | STRING	
-		{ $return = $item{PLAIN}||$item{HTML}||$item{NIL}||$item{STRING} ; 
-		  $return||defined($return);
-		}
-bodyparms:	NIL |  '(' kvpair(s) ')' 		
-		{
-                          $return = $item{NIL} || 
-                                    { map { (%$_) } @{$item{'kvpair(s)'}} };
-                          $return || defined($return); 
-                        }
-bodydisp:	NIL |  '(' kvpair(s) ')'		
-		{
-                          $return = $item{NIL} || 
-                                    { map { (%$_) } @{$item{'kvpair(s)'}} };
-                          $return || defined($return); 
-                        }
-bodyid:		...!/[()]/ NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING} ; $return||defined($return);}
-
-bodydesc:	...!/[()]/ NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}
-
-bodyenc:	NIL | STRING |  '(' kvpair(s) ')'
-	{
-		$return = $item{NIL} 		|| 
-			  $item{STRING} 	||
-			  { map { (%$_) } @{$item{'kvpair(s)'}} };
-		$return||defined($return);
-
-	}
-bodysize:	...!/[()]/ NIL | NUMBER		
-	{ $return = $item{NIL} || $item{NUMBER}; $return||defined($return);}
-
-bodyMD5:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}
-
-bodylang:	NIL | STRING | "(" STRING(s) ")"
-	{ $return = $item{NIL} || $item{'STRING(s)'}; $return||defined($return);}
-
-bodyextra:	NIL | STRING | "(" STRING(s) ")"
-	{ 0 }
-
-personalname:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}
-
-sourceroute:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}
-
-mailboxname:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}
-
-hostname:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}
-
-addressstruct: "(" personalname sourceroute mailboxname hostname ")"
-		{ bless {
-			personalname => $item{personalname} ,	
-			sourceroute  => $item{sourceroute} ,	
-			mailboxname  => $item{mailboxname} ,	
-			hostname     => $item{hostname} ,	
-		  }, 'Mail::IMAPClient::BodyStructure::Address';
-		}
-
-subject:	NIL | STRING 
-		{ 
-			$return = $item{NIL} || $item{STRING} ;
-			$return||defined($return);
-		}
-inreplyto:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING} ;$return||defined($return);}
-
-messageid:	NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING} ;$return||defined($return);}
-
-date:		NIL | STRING		
-	{ $return = $item{NIL} || $item{STRING} ;$return||defined($return);}
-
-cc:		NIL | "(" addressstruct(s) ")" 		
-	{ $return = $item{NIL} || $item{'addressstruct(s)'} }
-
-bcc:		NIL | "(" addressstruct(s) ")" 		
-	{ $return = $item{NIL} || $item{'addressstruct(s)'} }
-
-from:		NIL | "(" addressstruct(s) ")"		
-	{ $return = $item{NIL} || $item{'addressstruct(s)'} }
-
-replyto:	NIL | "(" addressstruct(s) ")"		
-	{ $return = $item{NIL} || $item{'addressstruct(s)'} }
-
-sender:		NIL | "(" addressstruct(s) ")"		
-	{ $return = $item{NIL} || $item{'addressstruct(s)'} }
-
-to:		NIL | "(" addressstruct(s) ")"		
-	{ $return = $item{NIL} || $item{'addressstruct(s)'} }
-
-envelopestruct:	"(" date subject from sender replyto to cc bcc inreplyto messageid ")" 
-	{ $return = bless {}, "Mail::IMAPClient::BodyStructure::Envelope"; 
-	  $return->{$_} = $item{$_}
-	     for qw/date subject from sender replyto to cc/
-               , qw/bcc inreplyto messageid/ ;
-	  $return;
-	}
-
-basicfields: 	bodysubtype bodyparms bodyid(?) 
-		bodydesc(?) bodyenc(?) 
-		bodysize(?) 			{ 
-
-	
-	   $return =
-	     { bodysubtype => $item{bodysubtype}
-	     , bodyparms   => $item{bodyparms}
-             };
-           $return->{$_} = ref $item{"$_(?}"} ? $item{"$_(?}"}[0] :$item{"$_(?}"}
-	       for qw/bodyid bodydesc bodyenc bodysize/;
-	   $return;
-	}
-
-textmessage: 	TEXT <commit> basicfields textlines(?) bodyMD5(?)
-		bodydisp(?) bodylang(?) bodyextra(?)
-	{ 
-	  $return = $item{basicfields} || {};
-	  $return->{bodytype} = 'TEXT';
-          foreach my $what (qw/textlines(?) bodyMD5(?) bodydisp(?) bodylang(?)/)
-	  {   my $k = $what; $k =~ s/\(\?\)$//;
-	      $return->{$k} = $item{$what}[0] if ref $item{$what};
-	  }
-
-	  $return;
-        }
-
-othertypemessage: bodytype basicfields bodyparms(?) bodydisp(?)
-	          bodylang(?) bodyextra(?)
-	{ $return = {}; 
-	  foreach my $what ( qw/bodytype bodyparms(?) bodydisp(?)/
-	                   , qw/bodylang(?) bodyextra(?)/ )
-	  {   my $k = $what; $k =~ s/\(\?\)$//;
-	      $return->{$k} = ref($item{$what})? $item{$what}[0] : $item{$what} ;
-	  }
-	  while( my($k,$v) = each %{$item{basicfields}} ) { $return->{$k} = $v }
-	  $return;
-	}
-
-messagerfc822message: 
-		rfc822message <commit> bodyparms bodyid bodydesc bodyenc bodysize 
-		envelopestruct bodystructure textlines
-		bodyMD5(?) bodydisp(?) bodylang(?) bodyextra(?)
-	{ 
-	  $return = {}; 
-	  foreach my $what (qw/	bodyparms bodyid bodydesc bodyenc bodysize 
-				envelopestruct bodystructure textlines
-				bodyMD5(?) bodydisp(?) bodylang(?) bodyextra(?)
-	  		     /
-	  ) {
-		my $k = $what; $k =~ s/\(\?\)$//;
-                $return->{$k} = ref $item{$what} =~ 'ARRAY'?
-                                        $item{$what}[0] : $item{$what};
-        }
-        while(my($k,$v) = each %{$item{bodystructure}[0]}) { $return->{$k} = $v}
-        while(my($k,$v) = each %{$item{basicfields}})      { $return->{$k} = $v}
-	$return->{bodytype}    = "MESSAGE" ; 
-	$return->{bodysubtype} = "RFC822" ;
-	$return;
-	}
-
-subpart:	"(" part ")"  	
-	{   $return = $item{part} ; 
-	    $return||defined($return);
-	}	<defer: ++$subpartCount;>
-
-
-part:		subpart(s) <commit> basicfields 
-			bodyparms(?) bodydisp(?) bodylang(?) bodyextra(?)
-			<defer: $subpartCount = 0>
-	{   $return = bless $item{basicfields},"Mail::IMAPClient::BodyStructure";
-	    $return->{bodytype} = "MULTIPART";
-	    $return->{bodystructure} = $item{'subpart(s)'};
-	    foreach my $b (qw/bodyparms(?) bodydisp(?) bodylang(?) bodyextra(?)/)
-	    {   my $k = $b; $k =~ s/\(\?\)$//;
-	        $return->{$k} = ref($item{$b}) ? $item{$b}[0] : $item{$b};
-	    }
-	    $return;
-	}
-		| 	textmessage 
-	{  $return = bless $item{textmessage}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	}
-		| 	messagerfc822message
-	{  $return = bless $item{messagerfc822message}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	}
-		| 	othertypemessage
-	{  $return = bless $item{othertypemessage}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	}
-
-bodystructure: 	 "(" part(s) ")"
-	{   $return = $item{'part(s)'} ;
-	    $return||defined($return);
-	}
-
-start:		/.*\(.*BODYSTRUCTURE \(/i part(1)  /\).*\)\r?\n?/
-	{
-	    #print STDERR "item = ",Data::Dumper->Dump([\%item],['$item']);
-	    $return = $item{'part(1)'}[0];
-	    $return || defined $return;
-	}
-
-envelope:	/.*\(.*ENVELOPE/ envelopestruct /.*\)/
-	{   $return = $item{envelopestruct};
-	    $return || defined $return;
-	}
diff --git a/Mail-IMAPClient-3.00/COPYRIGHT b/Mail-IMAPClient-3.05/COPYRIGHT
similarity index 100%
rename from Mail-IMAPClient-3.00/COPYRIGHT
rename to Mail-IMAPClient-3.05/COPYRIGHT
diff --git a/Mail-IMAPClient-3.00/Changes b/Mail-IMAPClient-3.05/Changes
similarity index 96%
rename from Mail-IMAPClient-3.00/Changes
rename to Mail-IMAPClient-3.05/Changes
index 1d69433..5a89171 100644
--- a/Mail-IMAPClient-3.00/Changes
+++ b/Mail-IMAPClient-3.05/Changes
@@ -3,6 +3,107 @@
 All changes from 2.99_01 upward are made by Mark Overmeer.  The changes
 before that are applied by David Kernen
 
+version 3.05: Wed Feb 20 08:59:37 CET 2008
+
+	Fixes:
+
+	- match ENVELOPE and BODYSTRUCTURE more strict in the
+	  grammar, to avoid confusion. [Zach Levow]
+
+	- get_envelope and get_bodystructure failed for servers which
+          did not return the whole answer in one piece. [Zach Levow]
+
+	- do not produce parser errors when get_envelope does not
+	  return an envelope. [Zach Levow]
+
+	- PLAIN login response possibly solely a '+' [Zach] and [Nick]
+
+version 3.04: Fri Jan 25 09:25:51 CET 2008
+
+	Fixes:
+
+	- read_header fix for UID on Windows Server 2003.
+          rt.cpan.org#32398 [Michiel Stelman]
+
+	Improvements:
+
+	- doc update on authentication, by [Thomas Jarosch]
+
+version 3.03: Wed Jan  9 22:11:36 CET 2008
+
+	Fixes:
+
+	- LIST (f.i. used by folders()) did not return anything when the
+	  passed argument had a trailing separator. [Gunther Heintze]
+
+	- Rfc2060_datetime() must include a zone.
+          rt.cpan.org#31971 [David Golden]
+
+	- folders() uses LIST, and then calls a STATUS on each of the
+	  names found.	This is superfluous, and will cause problems when
+	  the STATUS fails... for instance because of ACL limitations
+	  on the sub-folder.
+	  rt.cpan.org#31962 [Thomas Jarosch]
+
+	- fixed a zillion of problems in the BodyStructure parser.  The
+	  original author did not understand parsing, nor Perl.
+
+	- part numbering wrong when nested messages contained multiparts
+
+	Improvements:
+
+	- implementation of DIGEST-MD5 authentication [Thomas Jarosch]
+
+	- removed call for status() in Massage(), which hopefully speeds-up
+	  things without destroying anything.  It removed a possible deep
+	  recursion, which no-one reported (so should be ok to remove it)
+
+	- simplified folders() algorithm.
+
+	- merged folder commands, like subscribe into one.
+
+	- added unsubscribe()
+	  rt.cpan.org#31268 [G Miller]
+
+	- lazy-load Digest::HMAC_MD5
+
+version 3.02: Wed Dec  5 21:33:17 CET 2007
+
+	Fixes:
+
+	- Another attempt to get get FETCH UID right.  Patch by [David Golden]
+
+version 3.01: Wed Dec  5 09:55:43 CET 2007
+
+	Changes:
+
+	- removed version number from ::BodyStructure
+
+	Fixes:
+
+	- quote password at login.
+	  rt.cpan.org#31035 [Andy Harriston]
+
+	- empty return of flags command should be empty list, not undef.
+	  rt.cpan.org#31195 [David Golden]
+
+	- UID command does not work with folder management commands
+	  rt.cpan.org#31182 [Robbert Norris]
+
+	- _read_line simplifications avoids timeouts.
+	  rt.cpan.org#31221 [Robbert Norris]
+
+	- FETCH did not detect the UID of a message anymore.
+	  [David Golden]
+
+	Improvements:
+
+	- proxyauth for SUN/iPlanet/NetScape IMAP servers.
+	  patch by rt.cpan.org#31152 [Robbert Norris]
+
+	- use grep in stead of map in one occasion in MessageSet.pm
+	  [Yves Orton]
+
 version 3.00: Wed Nov 28 09:56:54 CET 2007
 
 	Fixes:
diff --git a/Mail-IMAPClient-3.00/INSTALL b/Mail-IMAPClient-3.05/INSTALL
similarity index 100%
rename from Mail-IMAPClient-3.00/INSTALL
rename to Mail-IMAPClient-3.05/INSTALL
diff --git a/Mail-IMAPClient-3.00/MANIFEST b/Mail-IMAPClient-3.05/MANIFEST
similarity index 100%
rename from Mail-IMAPClient-3.00/MANIFEST
rename to Mail-IMAPClient-3.05/MANIFEST
diff --git a/Mail-IMAPClient-3.00/META.yml b/Mail-IMAPClient-3.05/META.yml
similarity index 79%
rename from Mail-IMAPClient-3.00/META.yml
rename to Mail-IMAPClient-3.05/META.yml
index 742c8b8..06337d7 100644
--- a/Mail-IMAPClient-3.00/META.yml
+++ b/Mail-IMAPClient-3.05/META.yml
@@ -1,9 +1,10 @@
 --- #YAML:1.0
 name:                Mail-IMAPClient
-version:             3.00
+version:             3.05
 abstract:            IMAP4 client library
 license:             ~
-generated_by:        ExtUtils::MakeMaker version 6.36_01
+author:              ~
+generated_by:        ExtUtils::MakeMaker version 6.42
 distribution_type:   module
 requires:     
     Carp:                          0
@@ -21,5 +22,5 @@ requires:
     Test::More:                    0
     Test::Pod:                     0
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.2.html
-    version: 1.2
+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
+    version: 1.3
diff --git a/Mail-IMAPClient-3.00/Makefile.PL b/Mail-IMAPClient-3.05/Makefile.PL
similarity index 94%
rename from Mail-IMAPClient-3.00/Makefile.PL
rename to Mail-IMAPClient-3.05/Makefile.PL
index dd09d08..58fc669 100644
--- a/Mail-IMAPClient-3.00/Makefile.PL
+++ b/Mail-IMAPClient-3.05/Makefile.PL
@@ -2,6 +2,8 @@ use ExtUtils::MakeMaker;
 use warnings;
 use strict;
 
+sub set_test_data();
+
 WriteMakefile
  ( NAME         => 'Mail::IMAPClient',
  , ABSTRACT     => 'IMAP4 client library'
@@ -28,8 +30,14 @@ WriteMakefile
 
 set_test_data();
 
-sub set_test_data {
-    unless(-f "lib/Mail/IMAPClient.pm")
+exit 0;
+
+###
+### HELPERS
+###
+
+sub set_test_data()
+{   unless(-f "lib/Mail/IMAPClient.pm")
     {   warn "ERROR: not in installation directory\n";
         return;
     }
@@ -46,7 +54,7 @@ __INTRO
     my $yes = prompt "Do you want to run the extended tests? (n/y)";
     return if $yes !~ /^[Yy](?:[Ee]:[Ss]?)?$/ ;
 
-    unless(open TST,">./test.txt")
+    unless(open TST, '>', "./test.txt")
     {   warn "ERROR: couldn't open ./test.txt: $!\n";
         return;
     }
diff --git a/Mail-IMAPClient-3.00/README b/Mail-IMAPClient-3.05/README
similarity index 100%
rename from Mail-IMAPClient-3.00/README
rename to Mail-IMAPClient-3.05/README
diff --git a/Mail-IMAPClient-3.00/Todo b/Mail-IMAPClient-3.05/Todo
similarity index 100%
rename from Mail-IMAPClient-3.00/Todo
rename to Mail-IMAPClient-3.05/Todo
diff --git a/Mail-IMAPClient-3.00/examples/build_dist.pl b/Mail-IMAPClient-3.05/examples/build_dist.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/build_dist.pl
rename to Mail-IMAPClient-3.05/examples/build_dist.pl
diff --git a/Mail-IMAPClient-3.00/examples/build_ldif.pl b/Mail-IMAPClient-3.05/examples/build_ldif.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/build_ldif.pl
rename to Mail-IMAPClient-3.05/examples/build_ldif.pl
diff --git a/Mail-IMAPClient-3.00/examples/cleanTest.pl b/Mail-IMAPClient-3.05/examples/cleanTest.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/cleanTest.pl
rename to Mail-IMAPClient-3.05/examples/cleanTest.pl
diff --git a/Mail-IMAPClient-3.00/examples/copy_folder.pl b/Mail-IMAPClient-3.05/examples/copy_folder.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/copy_folder.pl
rename to Mail-IMAPClient-3.05/examples/copy_folder.pl
diff --git a/Mail-IMAPClient-3.00/examples/cyrus_expire.pl b/Mail-IMAPClient-3.05/examples/cyrus_expire.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/cyrus_expire.pl
rename to Mail-IMAPClient-3.05/examples/cyrus_expire.pl
diff --git a/Mail-IMAPClient-3.00/examples/cyrus_expunge.pl b/Mail-IMAPClient-3.05/examples/cyrus_expunge.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/cyrus_expunge.pl
rename to Mail-IMAPClient-3.05/examples/cyrus_expunge.pl
diff --git a/Mail-IMAPClient-3.00/examples/find_dup_msgs.pl b/Mail-IMAPClient-3.05/examples/find_dup_msgs.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/find_dup_msgs.pl
rename to Mail-IMAPClient-3.05/examples/find_dup_msgs.pl
diff --git a/Mail-IMAPClient-3.00/examples/imap_to_mbox.pl b/Mail-IMAPClient-3.05/examples/imap_to_mbox.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/imap_to_mbox.pl
rename to Mail-IMAPClient-3.05/examples/imap_to_mbox.pl
diff --git a/Mail-IMAPClient-3.00/examples/imtestExample.pl b/Mail-IMAPClient-3.05/examples/imtestExample.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/imtestExample.pl
rename to Mail-IMAPClient-3.05/examples/imtestExample.pl
diff --git a/Mail-IMAPClient-3.00/examples/migrate_mail2.pl b/Mail-IMAPClient-3.05/examples/migrate_mail2.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/migrate_mail2.pl
rename to Mail-IMAPClient-3.05/examples/migrate_mail2.pl
diff --git a/Mail-IMAPClient-3.00/examples/migrate_mbox.pl b/Mail-IMAPClient-3.05/examples/migrate_mbox.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/migrate_mbox.pl
rename to Mail-IMAPClient-3.05/examples/migrate_mbox.pl
diff --git a/Mail-IMAPClient-3.00/examples/populate_mailbox.pl b/Mail-IMAPClient-3.05/examples/populate_mailbox.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/populate_mailbox.pl
rename to Mail-IMAPClient-3.05/examples/populate_mailbox.pl
diff --git a/Mail-IMAPClient-3.00/examples/sharedFolder.pl b/Mail-IMAPClient-3.05/examples/sharedFolder.pl
similarity index 100%
rename from Mail-IMAPClient-3.00/examples/sharedFolder.pl
rename to Mail-IMAPClient-3.05/examples/sharedFolder.pl
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient.pm b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient.pm
similarity index 87%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient.pm
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient.pm
index 1a0d509..1a1d66c 100644
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient.pm
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient.pm
@@ -2,7 +2,7 @@ use warnings;
 use strict;
 
 package Mail::IMAPClient;
-our $VERSION = '3.00';
+our $VERSION = '3.05';
 
 use Mail::IMAPClient::MessageSet;
 
@@ -18,7 +18,6 @@ use Carp qw(carp);
 use Fcntl       qw(F_GETFL F_SETFL O_NONBLOCK);
 use Errno       qw/EAGAIN/;
 use List::Util  qw/first min max sum/;
-use Digest::HMAC_MD5 qw/hmac_md5_hex/; 
 use MIME::Base64;
 
 use constant Unconnected   => 0;
@@ -57,7 +56,7 @@ BEGIN {
    # set-up accessors
    foreach my $datum (
      qw(State Port Server Folder Peek User Password Timeout Buffer
-        Debug Count Uid Debug_fh Maxtemperrors Authmechanism Authcallback
+        Debug Count Uid Debug_fh Maxtemperrors Authuser Authmechanism Authcallback
         Ranges Readmethod Showcredentials Prewritemethod Ignoresizeerrors
         Supportedflags Proxy))
    { no strict 'refs';
@@ -136,12 +135,13 @@ sub Rfc2060_date
     sprintf "%02d-%s-%04d", $date[3], $mnt[$date[4]], $date[5]+1900;
 }
 
-sub Rfc2060_datetime
-{   my ($class, $stamp) = @_; # 11-Jan-2000 04:04:04
+sub Rfc2060_datetime($;$)
+{   my ($class, $stamp, $zone) = @_; # 11-Jan-2000 04:04:04 +0000
+    $zone   ||= '+0000';
     my @date  = gmtime $stamp;
 
-    sprintf "%02d-%s-%04d %02d:%02d:%02d", $date[3], $mnt[$date[4]]
-      , $date[5]+1900, $date[2], $date[1], $date[0];
+    sprintf "%02d-%s-%04d %02d:%02d:%02d %s", $date[3], $mnt[$date[4]]
+      , $date[5]+1900, $date[2], $date[1], $date[0], $zone;
 }
 
 # Change CRLF into \n
@@ -177,9 +177,12 @@ sub Clear
     $oldclear;
 }
 
-# read-only access to the transaction number:
+# read-only access to the transaction number
 sub Transaction { shift->Count };
 
+# remove doubles from list
+sub _remove_doubles(@) { my %seen; grep { ! $seen{$_}++ } @_ }
+
 # the constructor:
 sub new
 {   my $class = shift;
@@ -311,6 +314,11 @@ sub login
         if $auth ne 'LOGIN';
 
     my $passwd = $self->Password;
+    if($passwd =~ m/\W/)  # need to quote
+    {   $passwd =~ s/(["\\])/\\$1/g;
+        $passwd = qq{"$passwd"};
+    }
+
     my $id     = $self->User;
     $id        = qq{"$id"} if $id !~ /^".*"$/;
 
@@ -321,6 +329,11 @@ sub login
     $self;
 }
 
+sub proxyauth
+{   my ($self, $user) = @_;
+    $self->_imap_command("PROXYAUTH $user") ? $self->Results : undef;
+}
+
 sub separator
 {   my ($self, $target) = @_;
     unless(defined $target)
@@ -362,8 +375,8 @@ sub sort
 sub list
 {   my ($self, $reference, $target) = @_;
     defined $reference or $reference = "";
-    defined $target    or $target = '*';
-    length $target     or $target = '""';
+    defined $target    or $target    = '*';
+    length $target     or $target    = '""';
 
     $target eq '*' || $target eq '""'
          or $target = $self->Massage($target);
@@ -414,10 +427,7 @@ sub subscribed
                  /ix;
     }
 
-    # for my $f (@folders) { $f =~ s/^\\FOLDER LITERAL:://;}
-    # remove doubles
-    my @clean; my %memory;
-    foreach (@folders) { push @clean, $_ unless $memory{$_}++ }
+    my @clean = _remove_doubles @folders;
     wantarray ? @clean : \@clean;
 }
 
@@ -597,8 +607,9 @@ sub message_to_file
     my $string = "$trans ${uid}FETCH $msgs $cmd";
 
     $self->_record($trans, [0, "INPUT", $string] );
-
+    print "string [$string]\n";
     my $feedback = $self->_send_line($string);
+    print "feedback [$feedback]\n";
     unless($feedback)
     {    $self->LastError("Error sending '$string' to IMAP: $!");
          return undef;
@@ -610,9 +621,11 @@ sub message_to_file
     until($code)
     {   my $output = $self->_read_line($handle)
             or return undef;
-
         foreach my $o (@$output)
-        {   $self->_record($trans,$o);
+        {   
+	    print "oD[", $o->[DATA], "]\n";
+	    print "oT[", $o->[TYPE], "]\n";
+	    $self->_record($trans,$o);
             next unless $self->_is_output($o);
 
             $code = $o->[DATA] =~ /^$trans\s+(OK|BAD|NO)/mi ? $1 : undef;
@@ -1099,8 +1112,7 @@ sub _imap_command
 }
 
 sub _imap_uid_command
-{   my $self = shift;
-    my $cmd  = shift;
+{   my ($self, $cmd) = (shift, shift);
     my $args = @_ ? join(" ", '', @_) : '';
     my $uid  = $self->Uid ? 'UID ' : '';
     $self->_imap_command("$uid$cmd$args");
@@ -1256,7 +1268,7 @@ sub _send_line
 
 # It is also re-implemented in: message_to_file
 #
-# syntax: $output = $self->_readline($literal_callback, $output_callback)
+# $output = $self->_read_line($literal_callback, $output_callback)
 #    Both input argument are optional, but if supplied must either
 #    be a filehandle, coderef, or undef.
 #
@@ -1284,8 +1296,8 @@ sub _read_line
     my $fast_io  = $self->Fast_io;
 
     until(@$oBuffer # there's stuff in output buffer:
-      && $oBuffer->[-1][DATA] =~ /\r\n$/ # the last thing there has cr-lf:
-      && $oBuffer->[-1][TYPE] eq "OUTPUT" # that thing is an output line:
+      && $oBuffer->[-1][TYPE] eq 'OUTPUT' # that thing is an output line:
+      && $oBuffer->[-1][DATA] =~ /\r?\n$/ # the last thing there has cr-lf:
       && !length $iBuffer                 # and the input buffer has been MT'ed:
     )
     {   my $transno = $self->Transaction;
@@ -1328,19 +1340,17 @@ sub _read_line
 
         while($iBuffer =~ s/^(.*?\r?\n)//)  # consume line
         {   my $current_line = $1;
-
-            # This part handles IMAP "Literals",
-            # which according to rfc2060 look something like this:
-            # [tag]|* BLAH BLAH {nnn}\r\n
-            # [nnn bytes of literally transmitted stuff]
-            # [part of line that follows literal data]\r\n
-
-            if($current_line !~ s/\s*\{(\d+)\}\r\n$//)
-            {   push @$oBuffer, [$index++, "OUTPUT" , $current_line];
+            if($current_line !~ s/\s*\{(\d+)\}\r?\n$//)
+            {   push @$oBuffer, [$index++, 'OUTPUT' , $current_line];
                 next;
             }
 
+            push @$oBuffer, [$index++, 'OUTPUT',  $current_line];
+
             ## handle LITERAL
+            # BLAH BLAH {nnn}\r\n
+            # [nnn bytes of literally transmitted stuff]
+            # [part of line that follows literal data]\r\n
 
             my $expected_size = $1;
 
@@ -1349,54 +1359,57 @@ sub _read_line
                "retrieve from the " . length($iBuffer) .
                " bytes in: $iBuffer<END_OF_iBuffer>");
 
-            my $litstring = $iBuffer;
+            my $litstring;
+            if(length $iBuffer >= $expected_size)
+            {   # already received all data
+                $litstring = substr $iBuffer, 0, $expected_size, '';
+            }
+            else
+            {   # literal data still to arrive
+                $litstring = $iBuffer;
+                $iBuffer   = '';
 
-            while($expected_size > length $litstring)
-            {   if($timeout)
-                {    # wait for data from the the IMAP socket.
-                     my $rvec = 0;
-                     vec($rvec, fileno($self->Socket), 1) = 1;
-                     unless(CORE::select($rvec, undef, $rvec, $timeout))
-                     {    $self->LastError("Tag $transno: Timeout waiting for "
-                             . "literal data from server");
-                         return undef;
-                     }
-                }
-                else # 1 ms before retry
-                {   CORE::select(undef, undef, undef, 0.001);
-                }
-
-                fcntl($socket, F_SETFL, $self->{_fcntl})
-                    if $fast_io && defined $self->{_fcntl};
-
-                my $ret = $self->_sysread($socket, \$litstring
-                  , $expected_size - length $litstring, length $litstring);
-
-                $self->_debug("Received ret=$ret and buffer = " .
-                   "\n$litstring<END>\nwhile processing LITERAL");
-
-                if($timeout && !defined $ret)
-                {   $self->_record($transno,
-                        [ $self->_next_index($transno), "ERROR",
-                   "$transno * NO Error reading data from server: $!"]);
-                    return undef;
-                }
-
-                if($ret == 0 && $socket->eof)
-                {   $self->_record($transno,
-                       [ $self->_next_index($transno), "ERROR",
-            "$transno * BYE Server unexpectedly closed connection: $!"]);
-                    $self->State(Unconnected);
-                    return undef;
+                while($expected_size > length $litstring)
+                {   if($timeout)
+                    {    # wait for data from the the IMAP socket.
+                         my $rvec = 0;
+                         vec($rvec, fileno($self->Socket), 1) = 1;
+                         unless(CORE::select($rvec, undef, $rvec, $timeout))
+                         {    $self->LastError("Tag $transno: Timeout waiting for "
+                                 . "literal data from server");
+                             return undef;
+                         }
+                    }
+                    else # 1 ms before retry
+                    {   CORE::select(undef, undef, undef, 0.001);
+                    }
+    
+                    fcntl($socket, F_SETFL, $self->{_fcntl})  #???why
+                        if $fast_io && defined $self->{_fcntl};
+    
+                    my $ret = $self->_sysread($socket, \$litstring
+                      , $expected_size - length $litstring, length $litstring);
+    
+                    $self->_debug("Received ret=$ret and buffer = " .
+                       "\n$litstring<END>\nwhile processing LITERAL");
+    
+                    if($timeout && !defined $ret)
+                    {   $self->_record($transno,
+                            [ $self->_next_index($transno), "ERROR",
+                       "$transno * NO Error reading data from server: $!"]);
+                        return undef;
+                    }
+    
+                    if($ret==0 && $socket->eof)
+                    {   $self->_record($transno,
+                           [ $self->_next_index($transno), "ERROR",
+                "$transno * BYE Server unexpectedly closed connection: $!"]);
+                        $self->State(Unconnected);
+                        return undef;
+                    }
                 }
             }
 
-            if(length $litstring > $expected_size)
-            {    # copy the extra struff into the iBuffer:
-                 $iBuffer = substr $litstring, $expected_size, length($litstring)-$expected_size,'';
-            }
-            else { $iBuffer = '' };
-
             if(!$literal_callback) { ; }
             elsif(UNIVERSAL::isa($literal_callback, 'GLOB'))
             {   print $literal_callback $litstring;
@@ -1411,31 +1424,8 @@ sub _read_line
                   . "invalid callback; must be a filehandle or CODE");
             }
 
-            $self->Fast_io($fast_io) if $fast_io;
-
-            # Now let's make sure there are no IMAP server output lines
-            # (i.e. [tag|*] BAD|NO|OK Text) embedded in the literal string
-            my $trailer;
-            if($iBuffer =~ s/\r?\n((?:\*|\d+)\s(?:BAD|NO|OK)[^\n]*\r?\n\z)//i)
-            {   $trailer = $1;
-                $self->_debug("Got output in literal: $trailer");
-            }
-
-            $self->_debug("literal includes ')' of FETCH")
-                if length $iBuffer
-                && $current_line =~ m/\bFETCH\b/i
-                && $iBuffer =~ s/\)$//;
-
-            if(length $iBuffer)
-            {   $self->_debug("literal: too much >>$iBuffer<<");
-                $litstring .= $iBuffer;
-                $iBuffer    = '';
-            }
-
-            push @$oBuffer, [$index++, "OUTPUT",  $current_line];
-            push @$oBuffer, [$index++, "LITERAL", $litstring];
-            push @$oBuffer, [$index++, "OUTPUT",  $trailer]
-                if $trailer;
+            $self->Fast_io($fast_io) if $fast_io;  # ???
+            push @$oBuffer, [$index++, 'LITERAL', $litstring];
         }
     }
 
@@ -1518,47 +1508,46 @@ sub logout
     $self;
 }
 
-sub folders
+sub folders($)
 {   my ($self, $what) = @_;
 
     return wantarray ? @{$self->{Folders}} : $self->{Folders}
-        if ref $self->{Folders} && !$what;
+        if !$what && $self->{Folders};
+
+    my @list;
+    if($what)
+    {   my $sep = $self->separator($what);
+        my $whatsub = $what =~ m/\Q${sep}\E$/ ? "$what*" : "$what$sep*";
+        push @list, $self->list(undef, $whatsub);
+        push @list, $self->list(undef, $what) if $self->exists($what);
+    }
+    else
+    {   push @list, $self->list(undef, undef);
+    }
 
     my @folders;
-    my @list = $self->list(undef,($what ? $what.$self->separator($what)."*" : undef ) );
-    push @list, $self->list(undef, $what)
-        if $what && $self->exists($what);
-
-    for(my $m = 0; $m < scalar(@list); $m++ )
+    for(my $m = 0; $m < @list; $m++ )
     {   if($list[$m] && $list[$m] !~ /\r\n$/ )
         {   $self->_debug("folders: concatenating $list[$m] and $list[$m+1]");
             $list[$m] .= $list[$m+1];
-            $list[$m+1] = "";
-            $list[$m] .= "\r\n" unless $list[$m] =~ /\r\n$/;
+            splice @list, $m+1, 1;
         }
 
-        $list[$m] =~ / ^\*\s+LIST               # * LIST
-                        \s+\([^\)]*\)\s+         # (Flags)
-                        (?:"[^"]*"|NIL)\s+     # "delimiter" or NIL
-                        (?:"([^"]*)"|(.*))\r\n$  # Name or "Folder name"
+        $list[$m] =~ / ^\* \s+ LIST \s+ \([^\)]*\) \s+  # * LIST (Flags)
+                        (?:\" [^"]* \" | NIL  )    \s+  # "delimiter" or NIL
+                        (?:\"([^"]*)\" | (\S+))    \s*$ # "name" or name
                      /ix
             or next;
 
-        my $folder = $1 || $2;
-        $folder = qq("$folder")
-            if $1 && !$self->exists($folder);
-
-        push @folders, $folder
+        push @folders, $1 || $2;
    }
 
-    my (@clean, %memory);
-    foreach my $f (@folders) { push @clean, $f unless $memory{$f}++ }
+    my @clean = _remove_doubles @folders;
     $self->{Folders} = \@clean unless $what;
 
     wantarray ? @clean : \@clean;
 }
 
-
 sub exists
 {   my ($self, $folder) = @_;
     $self->status($folder) ? $self : undef;
@@ -1580,11 +1569,12 @@ sub get_bodystructure
     }
     else
     {   $self->_debug("get_bodystructure: reassembling original response");
-        my $start = 0;
-        foreach my $o ($self->Results)
+        my $started = 0;
+        my $output  = '';
+        foreach my $o ($self->_transaction)
         {   next unless $self->_is_output_or_literal($o);
-            next unless $start or
-                $o->[DATA] =~ /BODYSTRUCTURE \(/i and ++$start; # Hi, vi! ;-)
+            $started++ if $o->[DATA] =~ /BODYSTRUCTURE \(/i; ; # Hi, vi! ;-)
+            $started or next;
 
             if(length $output && $self->_is_literal($o) )
             {   my $data = $o->[DATA];
@@ -1612,24 +1602,30 @@ sub get_envelope
         return undef;
     }
 
-    my @out = $self->fetch($msg,"ENVELOPE");
+    my @out = $self->fetch($msg, 'ENVELOPE');
     my $bs = "";
-    my $output = first { /ENVELOPE \(/i } @out;    # Wee! ;-)
+    my $output = first { /ENVELOPE \(/i } @out;    # vi ;-)
+
+    unless($output)
+    {   $self->LastError("Unable to use get_envelope: $@");
+        return undef;
+    }
+
     if($output =~ /\r\n$/ )
     {   eval { $bs = Mail::IMAPClient::BodyStructure::Envelope->new($output) };
     }
     else
     {   $self->_debug("get_envelope: reassembling original response");
-        my $start = 0;
-        foreach my $o ($self->Results)
+        my $started = 0;
+        $output = '';
+        foreach my $o ($self->_transaction)
         {   next unless $self->_is_output_or_literal($o);
             $self->_debug("o->[DATA] is $o->[DATA]");
 
-            next unless $start or
-                $o->[DATA] =~ /ENVELOPE \(/i and ++$start;
-                # Hi, vi! ;-)
+            $started++ if $o->[DATA] =~ /ENVELOPE \(/i; # Hi, vi! ;-)
+            $started or next;
 
-            if ( length($output) and $self->_is_literal($o) ) {
+            if(length($output) && $self->_is_literal($o) ) {
                 my $data = $o->[DATA];
                 $data =~ s/"/\\"/g;
                 $data =~ s/\(/\\\(/g;
@@ -1658,7 +1654,7 @@ sub fetch
       : $what;
 
     $self->_imap_uid_command(FETCH => $take, @_)
-        or return ();
+        or return;
 
     wantarray ? $self->History : $self->Results;
 }
@@ -1735,46 +1731,29 @@ sub store
     wantarray ? $self->History : $self->Results;
 }
 
-sub subscribe
-{   my ($self, @a) = @_;
+sub _imap_folder_command($$)
+{   my ($self, $command) = (shift, shift);
     delete $self->{Folders};
-    $a[-1] = $self->Massage($a[-1]) if @a;
-    $self->_imap_uid_command(SUBSCRIBE => @a)
-        or return undef;
-    wantarray ? $self->History : $self->Results;
-}
+    my $folder = $self->Massage(shift);
 
-sub delete
-{   my ($self, @a) = @_;
-    delete $self->{Folders};
-    $a[-1] = $self->Massage($a[-1]) if @a;
-    $self->_imap_uid_command(DELETE => @a)
-        or return undef;
-    wantarray ? $self->History : $self->Results;
-}
+    $self->_imap_command("$command $folder")
+        or return;
 
-sub myrights
-{   my ($self, @a) = @_;
-    delete $self->{Folders};
-    $a[-1] = $self->Massage($a[-1]) if @a;
-    $self->_imap_uid_command(MYRIGHTS => @a)
-        or return undef;
     wantarray ? $self->History : $self->Results;
 }
+    
+sub subscribe($)   { $_[0]->_imap_folder_command(SUBSCRIBE   => $_[1]) }
+sub unsubscribe($) { $_[0]->_imap_folder_command(UNSUBSCRIBE => $_[1]) }
+sub delete($)      { $_[0]->_imap_folder_command(DELETE      => $_[1]) }
+sub create($)      { $_[0]->_imap_folder_command(CREATE      => $_[1]) }
 
-sub create
-{   my ($self, @a) = @_;
-    delete $self->{Folders};
-    $a[0] = $self->Massage($a[0]) if @a;
-    $self->_imap_uid_command(CREATE => @a)
-        or return undef;
-    wantarray ? $self->History : $self->Results;
-}
+# rfc2086
+sub myrights($)    { $_[0]->_imap_folder_command(MYRIGHTS    => $_[1]) }
 
 sub close
 {   my $self = shift;
     delete $self->{Folders};
-    $self->_imap_uid_command('CLOSE')
+    $self->_imap_command('CLOSE')
         or return undef;
     wantarray ? $self->History : $self->Results;
 }
@@ -1817,10 +1796,10 @@ sub rename
 
 sub status
 {   my ($self, $folder) = (shift, shift);
-    my $which = @_ ? join(" ", @_) : 'MESSAGES';
-
     defined $folder or return;
 
+    my $which = @_ ? join(" ", @_) : 'MESSAGES';
+
     my $box = $self->Massage($folder);
     $self->_imap_command("STATUS $box ($which)")
         or return undef;
@@ -1839,21 +1818,21 @@ sub flags
 
     # Send command
     $self->fetch($msg, "FLAGS")
-        or return undef;
+        or return;
 
-    my $u_f = $self->Uid;
+    my $u_f     = $self->Uid;
     my $flagset = {};
 
     # Parse results, setting entry in result hash for each line
-    foreach my $resultline ($self->Results)
-    {   $self->_debug("flags: line = '$resultline'");
-        if (    $resultline =~
-            /\*\s+(\d+)\s+FETCH\s+    # * nnn FETCH
-             \(            # open-paren
-             (?:\s?UID\s(\d+)\s?)?    # optional: UID nnn <space>
-             FLAGS\s?\((.*)\)\s?      # FLAGS (\Flag1 \Flag2) <space>
-             (?:\s?UID\s(\d+))?       # optional: UID nnn
-             \)                       # close-paren
+    foreach my $line ($self->Results)
+    {   $self->_debug("flags: line = '$line'");
+        if (    $line =~
+            /\* \s+ (\d+) \s+ FETCH \s+    # * nnn FETCH
+             \(
+               (?:\s* UID \s+ (\d+) \s* )? # optional: UID nnn <space>
+               FLAGS \s* \( (.*?) \) \s*   # FLAGS (\Flag1 \Flag2) <space>
+               (?:\s* UID \s+ (\d+) \s* )? # optional: UID nnn
+             \)
             /x
         )
         {   my $mailid = $u_f ? ($2||$4) : $1;
@@ -1883,16 +1862,6 @@ sub supported_flags(@)
     grep { $sup->{ /^\\(\S+)/ ? lc $1 : ()} } @_;
 }
 
-# parse_headers modified to allow second param to also be a
-# reference to a list of numbers. If this is a case, the headers
-# are read from all the specified messages, and a reference to
-# an hash of mail numbers to references to hashes, are returned.
-# I found, with a mailbox of 300 messages, this was
-# *significantly* faster against our mailserver (< 1 second
-# vs. 20 seconds)
-#
-# 2000-03-22 Adrian Smith (adrian.smith@ucpag.com)
-
 sub parse_headers
 {   my ($self, $msgspec, @fields) = @_;
     my $fields = join ' ', @fields;
@@ -1905,25 +1874,36 @@ sub parse_headers
     my @raw = $self->fetch($string)
         or return undef;
 
-    my %headers; # HASH from message ids to headers
-    my $h;       # HASH of fields for current msgid
-    my $field;   # previous field name
+    my %headers; # message ids to headers
+    my $h;       # fields for current msgid
+    my $field;   # previous field name, for unfolding
     my %fieldmap = map { ( lc($_) => $_ ) } @fields;
+    my $msgid;
 
     foreach my $header (map {split /\r?\n/} @raw)
-    {
-        if($header =~ s/^(?:\*|UID) \s+ (\d+) \s+ FETCH \s+
-                        \( .*? BODY\[HEADER (?:\.FIELDS)? .*? \]\s*//ix)
+    {   # little problem: Windows2003 has UID as body, not in header
+        if($header =~ s/^\* \s+ (\d+) \s+ FETCH \s+
+                        \( (.*?) BODY\[HEADER (?:\.FIELDS)? .*? \]\s*//ix)
         {   # start new message header
-            $h = $headers{$1} = {};
+            ($msgid, my $msgattrs) = ($1, $2);
+            $h = {};
+            if($self->Uid)  # undef when win2003
+            {   $msgid = $msgattrs =~ m/\b UID \s+ (\d+)/x ? $1 : undef }
+
+            $headers{$msgid} = $h if $msgid;
         }
-        $header =~ /\S/ or next;
+        $header =~ /\S/ or next; # skip empty lines.
 
         # ( for vi
         if($header =~ /^\)/)  # end of this message
         {   undef $h;  # inbetween headers
             next;
         }
+        elsif(!$msgid && $header =~ /^\s*UID\s+(\d+)\s*\)/)
+        {   $headers{$1} = $h;   # finally found msgid, win2003
+            undef $h;
+            next;
+        }
 
         unless(defined $h)
         {   last if $header =~ / OK /i;
@@ -2067,7 +2047,7 @@ sub search
     foreach ($self->History)
     {   chomp;
         s/\r\n?/ /g;
-        s/^\*\s+SEARCH\s+(?=.*\d.*)// or next;
+        s/^\*\s+SEARCH\s+(?=.*?\d)// or next;
         push @hits, grep /^\d+$/, split;
     }
 
@@ -2209,7 +2189,7 @@ sub namespace {
         return undef;
     }
 
-    my $got = $self->_imap_command("NAMESPACE") or return ();
+    my $got = $self->_imap_command("NAMESPACE") or return;
     my @namespaces = map { /^\* NAMESPACE (.*)/ ? $1 : () }
        $got->Results;
 
@@ -2254,43 +2234,47 @@ sub is_parent
 
     for(my $m = 0; $m < @$list; $m++)
     {   return undef
-           if $list->[$m] =~ /NoInferior/i;
+           if $list->[$m] =~ /\bNoInferior\b/i;
 
         if($list->[$m]  =~ s/(\{\d+\})\r\n$// )
         {   $list->[$m] .= $list->[$m+1];
-            $list->[$m+1] = "";
+            splice @$list, $m+1, 1;
         }
 
         $line = $list->[$m]
             if $list->[$m] =~
-                    /       ^\*\s+LIST              # * LIST
-                            \s+\([^\)]*\)\s+            # (Flags)
-                            "[^"]*"\s+              # "delimiter"
-                            (?:"([^"]*)"|(.*))\r\n$  # Name or "Folder name"
-                    /x;
+                /^ \* \s+ LIST       \s+   # * LIST
+                   \([^\)]*\)        \s+   # (Flags)
+                   \"[^"]*\"         \s+   # "delimiter"
+                   (?:\"[^"]*\"|\S+) \s*$  # Name or "Folder name"
+                /x;
     }
 
     unless(length $line)
-    {  $self->_debug("Warning: separator method found no correct o/p in:\n\t".
+    {   $self->_debug("Warning: separator method found no correct o/p in:\n\t".
             join "\n\t", @$list);
-    }
-    my $f  = defined $line && $line =~ /^\*\s+LIST\s+\(([^\)]*)\s*\)/ ? $1 : undef;
-    return 1 if $f =~ /HasChildren/i;
-    return 0 if $f =~ /HasNoChildren/i;
-
-    unless($f =~ /\\/)        # no flags at all unless there's a backslash
-    {   my $sep  = $self->separator($folder) || $self->separator(undef);
-        my $lead = $folder . $sep;
-        my $len  = length $lead;
-        return scalar grep {$lead eq substr($_, 0, $len)} $self->folders;
+        return 0;
     }
 
-    0;  # ???
+    $line =~ /^\*\s+LIST\s+ \( ([^\)]*) \s*\)/x
+        or return 0;
+
+    my $flags = $1;
+
+    return 1 if $flags =~ /HasChildren/i;
+    return 0 if $flags =~ /HasNoChildren/i;
+    return 0 if $flags =~ /\\/;  # other flags found
+
+    # flag not supported, try via folders()
+    my $sep  = $self->separator($folder) || $self->separator(undef);
+    my $lead = $folder . $sep;
+    my $len  = length $lead;
+    scalar grep {$lead eq substr($_, 0, $len)} $self->folders;
 }
 
 sub selectable
 {   my ($self, $f) = @_;
-    not grep /NoSelect/i, $self->list("", $f);
+    not( grep /NoSelect/i, $self->list("", $f) );
 }
 
 sub append
@@ -2520,10 +2504,12 @@ sub authenticate
     until($code)
     {   my $output = $self->_read_line or return undef;
         foreach my $o (@$output)
-        {   $self->_record($count,$o);
-            $code = $o->[DATA] =~ /^\+\s+(.*)$/ ? $1 : undef;
+        {   $self->_record($count, $o);
+            $code = $o->[DATA] =~ /^\+\s+(\S+)\s*$/ ? $1
+                  : $o->[DATA] =~ /^\+\s*$/        ? 'OK'
+                  : undef;
 
-            if ($o->[DATA] =~ /^\*\s+BYE/)
+            if($o->[DATA] =~ /^\*\s+BYE/)
             {   $self->State(Unconnected);
                 return undef;
             }
@@ -2536,9 +2522,36 @@ sub authenticate
     if($scheme eq 'CRAM-MD5')
     {   $response ||= sub
           { my ($code, $client) = @_;
-            my $hmac = hmac_md5_hex(decode_base64($code), $client->Password);
+            use Digest::HMAC_MD5;
+            my $hmac = Digest::HMAC_MD5::hmac_md5_hex(decode_base64($code), $client->Password);
             encode_base64($client->User." ".$hmac);
-          }
+          };
+    }
+    elsif($scheme eq 'DIGEST-MD5')
+    {   $response ||= sub
+          { my ($code, $client) = @_;
+            require Authen::SASL;
+            require Digest::MD5;
+
+            my $authname = $client->Authuser;
+            defined $authname or $authname = $client->User;
+
+            my $sasl = Authen::SASL->new
+              ( mechanism => 'DIGEST-MD5'
+              , callback =>
+                 { user => $client->User
+                 , pass => $client->Password
+                 , authname => $authname
+                 }
+              );
+
+             # client_new is an empty function for DIGEST-MD5
+             my $conn   = $sasl->client_new('imap', 'localhost', '');
+             my $answer = $conn->client_step(decode_base64 $code);
+
+             encode_base64($response, '')
+                 if defined $answer;
+          };
     }
     elsif($scheme eq 'PLAIN')  # PLAIN SASL
     {   $response ||= sub
@@ -2562,12 +2575,12 @@ sub authenticate
         return undef;
     }
 
-    undef $code = $scheme eq 'PLAIN' ? 'OK' : undef;
+    undef $code;
     until($code)
     {   my $output = $self->_read_line or return undef;
         foreach my $o (@$output)
         {   $self->_record($count, $o);
-            $code = $o->[DATA] =~ /^\+\s+(.*)$/ ? $1 : undef;
+            $code = $o->[DATA] =~ /^\+\s+(.*?)\s*$/ ? $1 : undef;
 
             if($code)
             {   unless($self->_send_line($response->($code, $self)))
@@ -2719,23 +2732,15 @@ sub quota_usage
     ( map { /.*STORAGE\s+(\d+)\s+\d+.*\n$/ ? $1 : () } $self->Results)[0];
 }
 
-sub Quote {
-    my ($class, $arg) = @_;
-    return $class->Massage($arg, NonFolderArg);
-}
+sub Quote($) { $_[0]->Massage($_[1], NonFolderArg) }
 
-sub Massage
-{   my ($self, $arg, $notFolder) = @_;
-    $arg or return;
-    my $escaped_arg = $arg;
-    $escaped_arg =~ s/"/\\"/g;
-    $arg = substr($arg, 1, length($arg)-2) if $arg =~ /^".*"$/
-       && ! ( $notFolder || $self->status(qq("$escaped_arg"), "MESSAGES"));
+sub Massage($;$)
+{   my ($self, $name, $notFolder) = @_;
+    $name =~ s/^\"(.*)\"$/$1/ unless $notFolder;
 
-       if($arg =~ /["\\]/)    { $arg = "{".length($arg)."}\r\n$arg" }
-    elsif($arg =~ /[\s{}()]/) { $arg = qq("$arg") }
-
-    $arg;
+      $name =~ /["\\]/    ? "{".length($name)."}\r\n$name"
+    : $name =~ /[\s{}()]/ ? qq["$name"]
+    :                       $name;
 }
 
 sub unseen_count
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient.pod b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient.pod
similarity index 98%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient.pod
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient.pod
index f83f919..4b75c9d 100644
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient.pod
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient.pod
@@ -41,7 +41,7 @@ object's status, see the section labeled L<"Status Methods">, below.
 RFC2060 defines two commands for authenticating to an IMAP server:
 LOGIN for plain text authentication and AUTHENTICATE for more secure
 authentication mechanisms. Currently Mail::IMAPClient supports
-CRAM-MD5, LOGIN, PLAIN (SASL), and NTLM authentication.
+DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN (SASL), and NTLM authentication.
 
 There are also a number of methods and parameters that you can use to
 build your own authentication mechanism. Since this topic is a source of
@@ -161,16 +161,24 @@ call L<connect>, who will call L<login>. If B<login> sees that you've
 set an I<Authmechanism> then it will call B<authenticate>, using your
 I<Authmechanism> and I<Authcallback> parameters as arguments.
 
+=item Authuser
+
+Normally you authenticate and log in with the username specified in
+the User parameter. When you are using DIGEST-MD5 as I<Authmechanism>,
+you can optionally specify a different username for the final log in.
+This can be useful to mark messages as seen for the I<Authuser>
+if you don't know the password of the user as the seen state
+is often a per-user state.
+
 =item Authcallback 
 
 The I<Authcallback> parameter, if set, should contain a pointer
 to a subroutine. The L<login> method will use this as the callback
 argument to the B<authenticate> method if the I<Authmechanism> and
 I<Authcallback> parameters are both set. If you set I<Authmechanism>
-but not I<Authcallback> then the default callback for your mechanism
-will be used. CRAM-MD5, PLAIN (SASL), and NTLM authentication mechanisms
-have a default callback; in every other case not supplying the callback
-results in an error.
+but not I<Authcallback> then the default callback for your mechanism will
+be used.  All supported authentication mechanisms have a default callback;
+in every other case not supplying the callback results in an error.
 
 Most advanced authentication mechanisms require a challenge-response
 exchange. After the L<authenticate> method sends "<tag> AUTHENTICATE
@@ -518,6 +526,21 @@ seconds since the epoch date. It returns an RFC2060 compliant date
 string for that date (as required in date-related arguments to SEARCH,
 such as "since", "before", etc.). 
 
+=head2 Rfc2060_datetime
+
+Example:
+
+	$date = $imap->Rfc2060_datetime($seconds);
+	# or:
+	$date = Mail::IMAPClient->Rfc2060_datetime($seconds);
+
+The B<Rfc2060_datetime> method accepts one or two arguments: a obligatory
+timestamp and an optional zone.  The zone shall be formatted as
+C<< [+-]\d{4} >>, and defaults to C<< +0000 >>.  The timestamp follows the
+definition of the output of the platforms specific C<time>, usually in
+seconds since Jan 1st 1970.  However, you have to correct the number
+yourself for the zone.
+
 =head2 Rfc822_date
 
 Example:
@@ -778,9 +801,8 @@ override parameter settings.
 
 If you do not specify a second argument and you have not set the 
 I<Authcallback> parameter, then the first argument must be
-one of the authentication mechanisms for which B<Mail::IMAPClient> has
-built in support. Currently there is only built in support for CRAM-MD5, 
-but I hope to add more in future releases. 
+one of the authentication mechanisms for which B<Mail::IMAPClient>
+has built in support.
 
 If you are interested in doing NTLM authentication then please see Mark
 Bush's L<Authen::NTLM>, which can work with B<Mail::IMAPClient> to
@@ -1399,7 +1421,7 @@ B<has_capability>.
 Example:
 	
 	my $idle = $imap->idle or warn "Couldn't idle: $@\n";
-	&goDoOtherThings;
+	goDoOtherThings();
 	$imap->done($idle) or warn "Error from done: $@\n";
 
 The B<idle> method places the IMAP connection in an IDLE state. Your
@@ -1594,7 +1616,13 @@ B<login> is sometimes called automatically by L<connect>, which in turn
 is sometimes called automatically by L<new>. You can predict this 
 behavior once you've read the section on the L<new> method.
 
-=cut
+Then Sun/iPlanet/Netscape IMAP servers to allow an administrative user to
+masquerade as another user.  The B<proxyauth> method uses the IMAP
+PROXYAUTH client command provided like this:
+
+      $imap->login("admin", "password");
+      $imap->proxyauth("someuser");
+
 
 =head2 logout
 
@@ -3344,7 +3372,7 @@ Example:
 
 =head2 Socket
 
-B<PLEASE NOT>
+B<PLEASE NOTE>
 The semantics of this method has changed as of version 2.99_04 of this module.
 If you need the old semantics, you now have to use L<RawSocket>.
 
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure.pm b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure.pm
similarity index 99%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure.pm
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure.pm
index 6f99d27..29ae31e 100755
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure.pm
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure.pm
@@ -2,8 +2,6 @@ use warnings;
 use strict;
 
 package Mail::IMAPClient::BodyStructure;
-our $VERSION   = '0.0.4';
-
 use Mail::IMAPClient::BodyStructure::Parse;
 
 # my has file scope, not limited to package!
@@ -177,7 +175,7 @@ BEGIN
 
 
 package Mail::IMAPClient::BodyStructure::Address;
-@ISA = qw/Mail::IMAPClient::BodyStructure/;
+our @ISA = qw/Mail::IMAPClient::BodyStructure/;
 
 for my $datum ( qw(personalname mailboxname hostname sourcename) )
 {   no strict 'refs';
diff --git a/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.grammar b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.grammar
new file mode 100755
index 0000000..168e8a3
--- /dev/null
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.grammar
@@ -0,0 +1,185 @@
+# Directives
+# ( none)
+# Start-up Actions
+
+{
+    my $mibs  = "Mail::IMAPClient::BodyStructure";
+    my $subpartCount = 0;
+    my $partCount    = 0;
+
+    sub take_optional_items($$@)
+    {   my ($r, $items) = (shift, shift);
+        foreach (@_)
+        {   my $opt = $_ .'(?)';
+            exists $items->{$opt} or next;
+            $r->{$_} = UNIVERSAL::isa($items->{$opt}, 'ARRAY')
+                     ? $items->{$opt}[0] : $items->{$opt};
+        }
+    }
+
+    sub merge_hash($$)
+    {   my $to   = shift;
+        my $from = shift or return;
+	while( my($k,$v) = each %$from) { $to->{$k} = $v }
+    }
+}
+
+# Atoms
+
+TEXT:		/^"TEXT"|^TEXT/i 	{ $return = "TEXT"   }
+PLAIN:		/^"PLAIN"|^PLAIN/i 	{ $return = "PLAIN"  }
+HTML:		/"HTML"|HTML/i 		{ $return = "HTML"   }
+MESSAGE:	/^"MESSAGE"|^MESSAGE/i 	{ $return = "MESSAGE"}
+RFC822:		/^"RFC822"|^RFC822/i  	{ $return = "RFC822" }
+NIL:		/^NIL/i			{ $return = "NIL"    }
+NUMBER:		/^(\d+)/		{ $return = $item[1] }
+
+# 	Strings:
+
+SINGLE_QUOTED_STRING: "'" /(?:\\'|[^'])*/ "'" { $return = $item{__PATTERN1__} }
+DOUBLE_QUOTED_STRING: '"' /(?:\\"|[^"])*/ '"' { $return = $item{__PATTERN1__} }
+
+BARESTRING:	...!/^[)('"]/	/^(?!\(|\))(?:\\ |\S)+/
+	{ $return = $item{__PATTERN1__} }
+
+STRING:		DOUBLE_QUOTED_STRING | SINGLE_QUOTED_STRING | BARESTRING
+
+STRINGS:	"(" STRING(s) ")" { $return = $item{'STRING(s)'} }
+
+textlines:	NIL | NUMBER
+
+rfc822message:  MESSAGE RFC822    { $return = "MESSAGE RFC822" }
+
+bodysubtype:	PLAIN | HTML | NIL | STRING
+
+key:		STRING
+value:		NIL | NUMBER | STRING | KVPAIRS
+
+kvpair:		...!")" key value
+	{ $return = { $item{key} => $item{value} } }
+
+KVPAIRS:	"(" kvpair(s) ")"
+       { $return = { map { (%$_) } @{$item{'kvpair(s)'}} } }
+
+bodytype:	STRING
+bodyparms:	NIL | KVPAIRS
+bodydisp:	NIL | KVPAIRS
+bodyid:		...!/[()]/ NIL | STRING
+bodydesc:	...!/[()]/ NIL | STRING
+bodysize:	...!/[()]/ NIL | NUMBER
+bodyenc:	NIL | STRING | KVPAIRS
+bodyMD5:	NIL | STRING
+bodylang:	NIL | STRING | STRINGS
+bodyextra:	NIL | STRING | STRINGS
+
+personalname:	NIL | STRING
+sourceroute:	NIL | STRING
+mailboxname:	NIL | STRING
+hostname:	NIL | STRING
+
+addressstruct:	"(" personalname sourceroute mailboxname hostname ")"
+	{ bless { personalname => $item{personalname}
+		, sourceroute  => $item{sourceroute}
+		, mailboxname  => $item{mailboxname}
+		, hostname     => $item{hostname}
+	        }, 'Mail::IMAPClient::BodyStructure::Address';
+	}
+
+subject:	NIL | STRING
+inreplyto:	NIL | STRING
+messageid:	NIL | STRING
+date:		NIL | STRING
+
+ADDRESSES:	NIL
+	| "(" addressstruct(s) ")" { $return = $item{'addressstruct(s)'} }
+
+cc:		ADDRESSES
+bcc:		ADDRESSES
+from:		ADDRESSES
+replyto:	ADDRESSES
+sender:		ADDRESSES
+to:		ADDRESSES
+
+envelopestruct:	"(" date subject from sender replyto to cc
+	        bcc inreplyto messageid ")"
+	{ $return = bless {}, "Mail::IMAPClient::BodyStructure::Envelope";
+	  $return->{$_} = $item{$_}
+	     for qw/date subject from sender replyto to cc/
+	       , qw/bcc inreplyto messageid/;
+	  1;
+	}
+
+basicfields: 	bodysubtype bodyparms(?) bodyid(?)
+		bodydesc(?) bodyenc(?) bodysize(?)
+	{  $return = { bodysubtype => $item{bodysubtype} };
+	   take_optional_items($return, \%item,
+	      qw/bodyparms bodyid bodydesc bodyenc bodysize/);
+	   1;
+	}
+
+textmessage: 	TEXT <commit> basicfields textlines(?) bodyMD5(?)
+		bodydisp(?) bodylang(?) bodyextra(?)
+	{
+	  $return = $item{basicfields} || {};
+	  $return->{bodytype} = 'TEXT';
+	  take_optional_items($return, \%item
+            , qw/textlines bodyMD5 bodydisp bodylang bodyextra/);
+	  1;
+	}
+
+othertypemessage: bodytype basicfields bodyparms(?) bodydisp(?)
+	          bodylang(?) bodyextra(?)
+	{ $return = { bodytype => $item{bodytype} };
+	  take_optional_items($return, \%item
+             , qw/bodyparms bodydisp bodylang bodyextra/ );
+	  merge_hash($return, $item{basicfields});
+	  1;
+	}
+
+nestedmessage:	rfc822message <commit> bodyparms bodyid bodydesc bodyenc
+#		bodysize envelopestruct bodystructure textlines
+		bodysize envelopestruct(?) bodystructure(?) textlines(?)
+		bodyMD5(?) bodydisp(?) bodylang(?) bodyextra(?)
+	{
+	  $return = {};
+	  $return->{$_} = $item{$_}
+	      for qw/bodyparms bodyid bodydesc bodyenc bodysize/;
+#             envelopestruct bodystructure textlines/;
+
+	  take_optional_items($return, \%item
+, qw/envelopestruct bodystructure textlines/
+	    , qw/bodyMD5 bodydisp bodylang bodyextra/);
+
+	  merge_hash($return, $item{bodystructure}[0]);
+	  merge_hash($return, $item{basicfields});
+	  $return->{bodytype}    = "MESSAGE" ;
+	  $return->{bodysubtype} = "RFC822" ;
+	  1;
+	}
+
+multipart:	subpart(s) <commit> basicfields
+		bodyparms(?) bodydisp(?) bodylang(?) bodyextra(?)
+		<defer: $subpartCount = 0>
+	{ $return = $item{basicfields};
+	  $return->{bodytype}      = 'MULTIPART';
+	  $return->{bodystructure} = $item{'subpart(s)'};
+	  take_optional_items($return, \%item
+              , qw/bodyparms bodydisp bodylang bodyextra/);
+	  1;
+	}
+
+subpart:  "(" part ")" {$return = $item{part}} <defer: ++$subpartCount;>
+
+part:	  multipart        { $return = bless $item{multipart}, $mibs }
+	| textmessage      { $return = bless $item{textmessage}, $mibs }
+	| nestedmessage    { $return = bless $item{nestedmessage}, $mibs }
+	| othertypemessage { $return = bless $item{othertypemessage}, $mibs }
+
+bodystructure:	"(" part(s) ")"
+	{ $return = $item{'part(s)'} }
+
+start:		/.*?\(.*?BODYSTRUCTURE \(/i part(1)  /\).*\)\r?\n?/
+	{ $return = $item{'part(1)'}[0] }
+
+envelope:	/.*?\(.*?ENVELOPE/ envelopestruct /.*\)/
+	{ $return = $item{envelopestruct} }
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.pm b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.pm
similarity index 82%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.pm
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.pm
index 1f1d0df..e53f7bf 100644
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.pm
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.pm
@@ -9,8 +9,25 @@ use strict;
 use vars qw($skip $AUTOLOAD  );
 $skip = '\s*';
 
-	my $subpartCount = 0;
-	my $partCount    = 0;
+    my $mibs  = "Mail::IMAPClient::BodyStructure";
+    my $subpartCount = 0;
+    my $partCount    = 0;
+
+    sub take_optional_items($$@)
+    {   my ($r, $items) = (shift, shift);
+        foreach (@_)
+        {   my $opt = $_ .'(?)';
+            exists $items->{$opt} or next;
+            $r->{$_} = UNIVERSAL::isa($items->{$opt}, 'ARRAY')
+                     ? $items->{$opt}[0] : $items->{$opt};
+        }
+    }
+
+    sub merge_hash($$)
+    {   my $to   = shift;
+        my $from = shift or return;
+	while( my($k,$v) = each %$from) { $to->{$k} = $v }
+    }
 ;
 
 
@@ -128,7 +145,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: ['(' kvpair ')']},
+		Parse::RecDescent::_trace(q{Trying production: [KVPAIRS]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{bodyparms},
 					  $tracelevel)
@@ -141,112 +158,38 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyparms},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\(//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [kvpair]},
+		Parse::RecDescent::_trace(q{Trying subrule: [KVPAIRS]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{bodyparms},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		$expectation->is(q{kvpair})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::kvpair, 1, 100000000, $_noactions,$expectation,undef))) 
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::KVPAIRS($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [kvpair]>>},
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [KVPAIRS]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{bodyparms},
 						  $tracelevel)
 							if defined $::RD_TRACE;
+			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [kvpair]<< (}
-					. @$_tok . q{ times)},
+		Parse::RecDescent::_trace(q{>>Matched subrule: [KVPAIRS]<< (return value: [}
+					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodyparms},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{kvpair(s)}} = $_tok;
+		$item{q{KVPAIRS}} = $_tok;
 		push @item, $_tok;
 		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyparms},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\)//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyparms},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do {
-                          $return = $item{NIL} || 
-                                    { map { (%$_) } @{$item{'kvpair(s)'}} };
-                          $return || defined($return); 
-                        };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' kvpair ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [KVPAIRS]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodyparms},
 					  $tracelevel)
@@ -442,28 +385,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::date
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{date},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING} ;$return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -779,30 +700,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodysubtype
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodysubtype},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{PLAIN}||$item{HTML}||$item{NIL}||$item{STRING} ; 
-		  $return||defined($return);
-		};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -1000,28 +897,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::hostname
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{hostname},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -1160,35 +1035,33 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::basicfields
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying subrule: [bodyparms]},
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyparms]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{basicfields},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
 		$expectation->is(q{bodyparms})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms, 0, 1, $_noactions,$expectation,undef))) 
 		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyparms]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyparms]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{basicfields},
 						  $tracelevel)
 							if defined $::RD_TRACE;
-			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyparms]<< (return value: [}
-					. $_tok . q{]},
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyparms]<< (}
+					. @$_tok . q{ times)},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{basicfields},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{bodyparms}} = $_tok;
+		$item{q{bodyparms(?)}} = $_tok;
 		push @item, $_tok;
 		
-		}
+
 
 		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyid]},
 				  Parse::RecDescent::_tracefirst($text),
@@ -1309,16 +1182,10 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::basicfields
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { 
-
-	
-	   $return =
-	     { bodysubtype => $item{bodysubtype}
-	     , bodyparms   => $item{bodyparms}
-             };
-           $return->{$_} = ref $item{"$_(?}"} ? $item{"$_(?}"}[0] :$item{"$_(?}"}
-	       for qw/bodyid bodydesc bodyenc bodysize/;
-	   $return;
+		$_tok = ($_noactions) ? 0 : do {  $return = { bodysubtype => $item{bodysubtype} };
+	   take_optional_items($return, \%item,
+	      qw/bodyparms bodyid bodydesc bodyenc bodysize/);
+	   1;
 	};
 		unless (defined $_tok)
 		{
@@ -1531,28 +1398,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::personalname
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{personalname},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -1691,28 +1536,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::key
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{key},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{STRING} ; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -1808,7 +1631,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::cc
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+		Parse::RecDescent::_trace(q{Trying production: [ADDRESSES]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{cc},
 					  $tracelevel)
@@ -1821,17 +1644,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::cc
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+		Parse::RecDescent::_trace(q{Trying subrule: [ADDRESSES]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{cc},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [ADDRESSES]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{cc},
 						  $tracelevel)
@@ -1839,155 +1662,20 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::cc
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [ADDRESSES]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{cc},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{NIL}} = $_tok;
+		$item{q{ADDRESSES}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{cc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{cc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{cc});
-		%item = (__RULE__ => q{cc});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{cc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{cc},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{addressstruct})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{cc},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{cc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{addressstruct(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{cc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{cc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'addressstruct(s)'} };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [ADDRESSES]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{cc},
 					  $tracelevel)
@@ -2183,28 +1871,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyMD5
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyMD5},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -2300,7 +1966,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelope
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [/.*\\(.*ENVELOPE/ envelopestruct /.*\\)/]},
+		Parse::RecDescent::_trace(q{Trying production: [/.*?\\(.*?ENVELOPE/ envelopestruct /.*\\)/]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{envelope},
 					  $tracelevel)
@@ -2313,7 +1979,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelope
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: [/.*\\(.*ENVELOPE/]}, Parse::RecDescent::_tracefirst($text),
+		Parse::RecDescent::_trace(q{Trying terminal: [/.*?\\(.*?ENVELOPE/]}, Parse::RecDescent::_tracefirst($text),
 					  q{envelope},
 					  $tracelevel)
 						if defined $::RD_TRACE;
@@ -2321,7 +1987,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelope
 		$expectation->is(q{})->at($text);
 		
 
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A(?:.*\(.*ENVELOPE)//)
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A(?:.*?\(.*?ENVELOPE)//)
 		{
 			
 			$expectation->failed();
@@ -2400,9 +2066,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelope
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {   $return = $item{envelopestruct};
-	    $return || defined $return;
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = $item{envelopestruct} };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -2418,7 +2082,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelope
 		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [/.*\\(.*ENVELOPE/ envelopestruct /.*\\)/]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [/.*?\\(.*?ENVELOPE/ envelopestruct /.*\\)/]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{envelope},
 					  $tracelevel)
@@ -2557,7 +2221,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::MESSAGE
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = "MESSAGE" 	};
+		$_tok = ($_noactions) ? 0 : do { $return = "MESSAGE"};
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -2762,11 +2426,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::DOUBLE_QUOTED_STR
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {
-
-	 $return = $item{__PATTERN1__} ;
-	 $return||defined($return);
-};
+		$_tok = ($_noactions) ? 0 : do { $return = $item{__PATTERN1__} };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -2978,31 +2638,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::subject
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{subject},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { 
-			$return = $item{NIL} || $item{STRING} ;
-			$return||defined($return);
-		};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -3154,139 +2789,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::value
 		splice
 				@{$thisparser->{deferred}}, $def_at unless $_matched;
 				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' <commit> kvpair ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{value},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{value});
-		%item = (__RULE__ => q{value});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{value},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\(//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$&;
-		
-
-		
-
-		Parse::RecDescent::_trace(q{Trying directive: [<commit>]},
-					Parse::RecDescent::_tracefirst($text),
-					  q{value},
-					  $tracelevel)
-						if defined $::RD_TRACE; 
-		$_tok = do { $commit = 1 };
-		if (defined($_tok))
-		{
-			Parse::RecDescent::_trace(q{>>Matched directive<< (return value: [}
-						. $_tok . q{])},
-						Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		}
-		else
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match directive>>},
-						Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		}
-		
-		last unless defined $_tok;
-		push @item, $item{__DIRECTIVE1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [kvpair]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{value},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{kvpair})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::kvpair, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [kvpair]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{value},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [kvpair]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{value},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{kvpair(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{value},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\)//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$&;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' <commit> kvpair ')']<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{value},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
 	while (!$_matched && !$commit)
 	{
 		
@@ -3295,7 +2797,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::value
 					  q{value},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[2];
+		my $thisprod = $thisrule->{"prods"}[1];
 		$text = $_[1];
 		my $_savetext;
 		@item = (q{value});
@@ -3354,7 +2856,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::value
 					  q{value},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[3];
+		my $thisprod = $thisrule->{"prods"}[2];
 		$text = $_[1];
 		my $_savetext;
 		@item = (q{value});
@@ -3392,35 +2894,67 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::value
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
+
+		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{value},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		
+		$_matched = 1;
+		last;
+	}
 
-		$_tok = ($_noactions) ? 0 : do { 	$return = $item{NIL} 		|| 
-			$item{NUMBER} 			|| 
-			$item{STRING} 			|| 
-			{ map { (%$_) } @{$item{'kvpair(s)'}} } ;
-			$return||defined($return);
-		};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: [KVPAIRS]},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{value},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[3];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{value});
+		%item = (__RULE__ => q{value});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying subrule: [KVPAIRS]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{value},
+				  $tracelevel)
 					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::KVPAIRS($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [KVPAIRS]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{value},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
+		Parse::RecDescent::_trace(q{>>Matched subrule: [KVPAIRS]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{value},
+					  $tracelevel)
 						if defined $::RD_TRACE;
+		$item{q{KVPAIRS}} = $_tok;
 		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
 		
+		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [KVPAIRS]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{value},
 					  $tracelevel)
@@ -3616,28 +3150,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::inreplyto
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{inreplyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING} ;$return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -3835,28 +3347,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messageid
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messageid},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING} ;$return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -3952,7 +3442,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::sender
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+		Parse::RecDescent::_trace(q{Trying production: [ADDRESSES]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{sender},
 					  $tracelevel)
@@ -3965,17 +3455,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::sender
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+		Parse::RecDescent::_trace(q{Trying subrule: [ADDRESSES]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{sender},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [ADDRESSES]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{sender},
 						  $tracelevel)
@@ -3983,155 +3473,20 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::sender
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [ADDRESSES]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{sender},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{NIL}} = $_tok;
+		$item{q{ADDRESSES}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{sender},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{sender},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{sender});
-		%item = (__RULE__ => q{sender});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{sender},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{sender},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{addressstruct})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{sender},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{sender},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{addressstruct(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{sender},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{sender},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'addressstruct(s)'} };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [ADDRESSES]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{sender},
 					  $tracelevel)
@@ -4183,17 +3538,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::sender
 }
 
 # ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
-sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::QUOTED_STRING
+sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::multipart
 {
 	my $thisparser = $_[0];
 	use vars q{$tracelevel};
 	local $tracelevel = ($tracelevel||0)+1;
 	$ERRORS = 0;
-	my $thisrule = $thisparser->{"rules"}{"QUOTED_STRING"};
+	my $thisrule = $thisparser->{"rules"}{"multipart"};
 	
-	Parse::RecDescent::_trace(q{Trying rule: [QUOTED_STRING]},
+	Parse::RecDescent::_trace(q{Trying rule: [multipart]},
 				  Parse::RecDescent::_tracefirst($_[1]),
-				  q{QUOTED_STRING},
+				  q{multipart},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 
@@ -4225,277 +3580,52 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::QUOTED_STRING
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [DOUBLE_QUOTED_STRING]},
+		Parse::RecDescent::_trace(q{Trying production: [subpart <commit> basicfields bodyparms bodydisp bodylang bodyextra <defer:{  $subpartCount = 0 }>]},
 					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{QUOTED_STRING},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		my $thisprod = $thisrule->{"prods"}[0];
 		$text = $_[1];
 		my $_savetext;
-		@item = (q{QUOTED_STRING});
-		%item = (__RULE__ => q{QUOTED_STRING});
+		@item = (q{multipart});
+		%item = (__RULE__ => q{multipart});
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [DOUBLE_QUOTED_STRING]},
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [subpart]},
 				  Parse::RecDescent::_tracefirst($text),
-				  q{QUOTED_STRING},
+				  q{multipart},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::DOUBLE_QUOTED_STRING($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::subpart, 1, 100000000, $_noactions,$expectation,undef))) 
 		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [DOUBLE_QUOTED_STRING]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [subpart]>>},
 						  Parse::RecDescent::_tracefirst($text),
-						  q{QUOTED_STRING},
+						  q{multipart},
 						  $tracelevel)
 							if defined $::RD_TRACE;
-			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [DOUBLE_QUOTED_STRING]<< (return value: [}
-					. $_tok . q{]},
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [subpart]<< (}
+					. @$_tok . q{ times)},
 					  
 					  Parse::RecDescent::_tracefirst($text),
-					  q{QUOTED_STRING},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{DOUBLE_QUOTED_STRING}} = $_tok;
+		$item{q{subpart(s)}} = $_tok;
 		push @item, $_tok;
 		
-		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [DOUBLE_QUOTED_STRING]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{QUOTED_STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: [SINGLE_QUOTED_STRING]},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{QUOTED_STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{QUOTED_STRING});
-		%item = (__RULE__ => q{QUOTED_STRING});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying subrule: [SINGLE_QUOTED_STRING]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{QUOTED_STRING},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::SINGLE_QUOTED_STRING($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [SINGLE_QUOTED_STRING]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{QUOTED_STRING},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [SINGLE_QUOTED_STRING]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{QUOTED_STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{SINGLE_QUOTED_STRING}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{QUOTED_STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do {
-
-	 $return = $item{DOUBLE_QUOTED_STRING}||$item{SINGLE_QUOTED_STRING} ;
-	 $return||defined($return);
-};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: [SINGLE_QUOTED_STRING]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{QUOTED_STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-        unless ( $_matched || defined($return) || defined($score) )
-	{
-				splice @{$thisparser->{deferred}}, $def_at;
-			  
-
-		$_[1] = $text;	# NOT SURE THIS IS NEEDED
-		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
-					 Parse::RecDescent::_tracefirst($_[1]),
-					 q{QUOTED_STRING},
-					 $tracelevel)
-					if defined $::RD_TRACE;
-		return undef;
-	}
-	if (!defined($return) && defined($score))
-	{
-		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
-					  q{QUOTED_STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$return = $score_return;
-	}
-	splice @{$thisparser->{errors}}, $err_at;
-	$return = $item[$#item] unless defined $return;
-	if (defined $::RD_TRACE)
-	{
-		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
-					  $return . q{])}, "",
-					  q{QUOTED_STRING},
-					  $tracelevel);
-		Parse::RecDescent::_trace(q{(consumed: [} .
-					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
-					  Parse::RecDescent::_tracefirst($text),
-					  , q{QUOTED_STRING},
-					  $tracelevel)
-	}
-	$_[1] = $text;
-	return $return;
-}
-
-# ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
-sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822message
-{
-	my $thisparser = $_[0];
-	use vars q{$tracelevel};
-	local $tracelevel = ($tracelevel||0)+1;
-	$ERRORS = 0;
-	my $thisrule = $thisparser->{"rules"}{"messagerfc822message"};
-	
-	Parse::RecDescent::_trace(q{Trying rule: [messagerfc822message]},
-				  Parse::RecDescent::_tracefirst($_[1]),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-
-	my $def_at = @{$thisparser->{deferred}};
-	my $err_at = @{$thisparser->{errors}};
-
-	my $score;
-	my $score_return;
-	my $_tok;
-	my $return = undef;
-	my $_matched=0;
-	my $commit=0;
-	my @item = ();
-	my %item = ();
-	my $repeating =  defined($_[2]) && $_[2];
-	my $_noactions = defined($_[3]) && $_[3];
- 	my @arg =        defined $_[4] ? @{ &{$_[4]} } : ();
-	my %arg =        ($#arg & 01) ? @arg : (@arg, undef);
-	my $text;
-	my $lastsep="";
-	my $expectation = new Parse::RecDescent::Expectation($thisrule->expected());
-	$expectation->at($_[1]);
-	
-	my $thisline;
-	tie $thisline, q{Parse::RecDescent::LineCounter}, \$text, $thisparser;
-
-	
-
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: [rfc822message <commit> bodyparms bodyid bodydesc bodyenc bodysize envelopestruct bodystructure textlines bodyMD5 bodydisp bodylang bodyextra]},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[0];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{messagerfc822message});
-		%item = (__RULE__ => q{messagerfc822message});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying subrule: [rfc822message]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::rfc822message($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [rfc822message]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [rfc822message]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{rfc822message}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
 		
 
 		Parse::RecDescent::_trace(q{Trying directive: [<commit>]},
 					Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE; 
 		$_tok = do { $commit = 1 };
@@ -4517,277 +3647,67 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		push @item, $item{__DIRECTIVE1__}=$_tok;
 		
 
-		Parse::RecDescent::_trace(q{Trying subrule: [bodyparms]},
+		Parse::RecDescent::_trace(q{Trying subrule: [basicfields]},
 				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
+				  q{multipart},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
+		$expectation->is(q{basicfields})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::basicfields($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [basicfields]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{multipart},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [basicfields]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{multipart},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{basicfields}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyparms]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{multipart},
+				  $tracelevel)
+					if defined $::RD_TRACE;
 		$expectation->is(q{bodyparms})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyparms]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyparms]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodyparms}} = $_tok;
-		push @item, $_tok;
 		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [bodyid]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{bodyid})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyid($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms, 0, 1, $_noactions,$expectation,undef))) 
 		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyid]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyparms]>>},
 						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyid]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodyid}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [bodydesc]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{bodydesc})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydesc($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodydesc]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodydesc]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodydesc}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [bodyenc]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{bodyenc})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyenc($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyenc]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyenc]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodyenc}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [bodysize]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{bodysize})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodysize($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodysize]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodysize]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodysize}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [envelopestruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{envelopestruct})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelopestruct($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [envelopestruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [envelopestruct]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{envelopestruct}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [bodystructure]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{bodystructure})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodystructure($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodystructure]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [bodystructure]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodystructure}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying subrule: [textlines]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		if (1) { no strict qw{refs};
-		$expectation->is(q{textlines})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::textlines($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
-		{
-			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [textlines]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			$expectation->failed();
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [textlines]<< (return value: [}
-					. $_tok . q{]},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{textlines}} = $_tok;
-		push @item, $_tok;
-		
-		}
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyMD5]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{bodyMD5})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyMD5, 0, 1, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyMD5]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
+						  q{multipart},
 						  $tracelevel)
 							if defined $::RD_TRACE;
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyMD5]<< (}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyparms]<< (}
 					. @$_tok . q{ times)},
 					  
 					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{bodyMD5(?)}} = $_tok;
+		$item{q{bodyparms(?)}} = $_tok;
 		push @item, $_tok;
 		
 
 
 		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodydisp]},
 				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
+				  q{multipart},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		$expectation->is(q{bodydisp})->at($text);
@@ -4796,7 +3716,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodydisp]>>},
 						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
+						  q{multipart},
 						  $tracelevel)
 							if defined $::RD_TRACE;
 			last;
@@ -4805,7 +3725,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 					. @$_tok . q{ times)},
 					  
 					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		$item{q{bodydisp(?)}} = $_tok;
@@ -4815,7 +3735,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 
 		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodylang]},
 				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
+				  q{multipart},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		$expectation->is(q{bodylang})->at($text);
@@ -4824,7 +3744,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodylang]>>},
 						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
+						  q{multipart},
 						  $tracelevel)
 							if defined $::RD_TRACE;
 			last;
@@ -4833,7 +3753,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 					. @$_tok . q{ times)},
 					  
 					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		$item{q{bodylang(?)}} = $_tok;
@@ -4843,7 +3763,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 
 		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyextra]},
 				  Parse::RecDescent::_tracefirst($text),
-				  q{messagerfc822message},
+				  q{multipart},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		$expectation->is(q{bodyextra})->at($text);
@@ -4852,7 +3772,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyextra]>>},
 						  Parse::RecDescent::_tracefirst($text),
-						  q{messagerfc822message},
+						  q{multipart},
 						  $tracelevel)
 							if defined $::RD_TRACE;
 			last;
@@ -4861,7 +3781,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 					. @$_tok . q{ times)},
 					  
 					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		$item{q{bodyextra(?)}} = $_tok;
@@ -4869,29 +3789,45 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		
 
 
+		
+
+		Parse::RecDescent::_trace(q{Trying directive: [<defer:{  $subpartCount = 0 }>]},
+					Parse::RecDescent::_tracefirst($text),
+					  q{multipart},
+					  $tracelevel)
+						if defined $::RD_TRACE; 
+		$_tok = do { push @{$thisparser->{deferred}}, sub {  $subpartCount = 0 }; };
+		if (defined($_tok))
+		{
+			Parse::RecDescent::_trace(q{>>Matched directive<< (return value: [}
+						. $_tok . q{])},
+						Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		}
+		else
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match directive>>},
+						Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		}
+		
+		last unless defined $_tok;
+		push @item, $item{__DIRECTIVE2__}=$_tok;
+		
+
 		Parse::RecDescent::_trace(q{Trying action},
 					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { 
-	  $return = {}; 
-	  foreach my $what (qw/	bodyparms bodyid bodydesc bodyenc bodysize 
-				envelopestruct bodystructure textlines
-				bodyMD5(?) bodydisp(?) bodylang(?) bodyextra(?)
-	  		     /
-	  ) {
-		my $k = $what; $k =~ s/\(\?\)$//;
-                $return->{$k} = ref $item{$what} =~ 'ARRAY'?
-                                        $item{$what}[0] : $item{$what};
-        }
-        while(my($k,$v) = each %{$item{bodystructure}[0]}) { $return->{$k} = $v}
-        while(my($k,$v) = each %{$item{basicfields}})      { $return->{$k} = $v}
-	$return->{bodytype}    = "MESSAGE" ; 
-	$return->{bodysubtype} = "RFC822" ;
-	$return;
+		$_tok = ($_noactions) ? 0 : do { $return = $item{basicfields};
+	  $return->{bodytype}      = 'MULTIPART';
+	  $return->{bodystructure} = $item{'subpart(s)'};
+	  take_optional_items($return, \%item
+              , qw/bodyparms bodydisp bodylang bodyextra/);
+	  1;
 	};
 		unless (defined $_tok)
 		{
@@ -4908,9 +3844,9 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [rfc822message <commit> bodyparms bodyid bodydesc bodyenc bodysize envelopestruct bodystructure textlines bodyMD5 bodydisp bodylang bodyextra]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [subpart <commit> basicfields bodyparms bodydisp bodylang bodyextra <defer:{  $subpartCount = 0 }>]<<},
 					  Parse::RecDescent::_tracefirst($text),
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		$_matched = 1;
@@ -4928,7 +3864,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 		$_[1] = $text;	# NOT SURE THIS IS NEEDED
 		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
 					 Parse::RecDescent::_tracefirst($_[1]),
-					 q{messagerfc822message},
+					 q{multipart},
 					 $tracelevel)
 					if defined $::RD_TRACE;
 		return undef;
@@ -4936,7 +3872,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 	if (!defined($return) && defined($score))
 	{
 		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel)
 						if defined $::RD_TRACE;
 		$return = $score_return;
@@ -4947,12 +3883,12 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822mess
 	{
 		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
 					  $return . q{])}, "",
-					  q{messagerfc822message},
+					  q{multipart},
 					  $tracelevel);
 		Parse::RecDescent::_trace(q{(consumed: [} .
 					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
 					  Parse::RecDescent::_tracefirst($text),
-					  , q{messagerfc822message},
+					  , q{multipart},
 					  $tracelevel)
 	}
 	$_[1] = $text;
@@ -5120,7 +4056,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyenc
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: ['(' kvpair ')']},
+		Parse::RecDescent::_trace(q{Trying production: [KVPAIRS]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{bodyenc},
 					  $tracelevel)
@@ -5133,114 +4069,38 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyenc
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyenc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\(//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [kvpair]},
+		Parse::RecDescent::_trace(q{Trying subrule: [KVPAIRS]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{bodyenc},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		$expectation->is(q{kvpair})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::kvpair, 1, 100000000, $_noactions,$expectation,undef))) 
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::KVPAIRS($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [kvpair]>>},
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [KVPAIRS]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{bodyenc},
 						  $tracelevel)
 							if defined $::RD_TRACE;
+			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [kvpair]<< (}
-					. @$_tok . q{ times)},
+		Parse::RecDescent::_trace(q{>>Matched subrule: [KVPAIRS]<< (return value: [}
+					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodyenc},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{kvpair(s)}} = $_tok;
+		$item{q{KVPAIRS}} = $_tok;
 		push @item, $_tok;
 		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyenc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\)//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyenc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do {
-		$return = $item{NIL} 		|| 
-			  $item{STRING} 	||
-			  { map { (%$_) } @{$item{'kvpair(s)'}} };
-		$return||defined($return);
-
-	};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' kvpair ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [KVPAIRS]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodyenc},
 					  $tracelevel)
@@ -5461,28 +4321,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydesc
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodydesc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -5578,7 +4416,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::start
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [/.*\\(.*BODYSTRUCTURE \\(/i part /\\).*\\)\\r?\\n?/]},
+		Parse::RecDescent::_trace(q{Trying production: [/.*?\\(.*?BODYSTRUCTURE \\(/i part /\\).*\\)\\r?\\n?/]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{start},
 					  $tracelevel)
@@ -5591,7 +4429,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::start
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: [/.*\\(.*BODYSTRUCTURE \\(/i]}, Parse::RecDescent::_tracefirst($text),
+		Parse::RecDescent::_trace(q{Trying terminal: [/.*?\\(.*?BODYSTRUCTURE \\(/i]}, Parse::RecDescent::_tracefirst($text),
 					  q{start},
 					  $tracelevel)
 						if defined $::RD_TRACE;
@@ -5599,7 +4437,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::start
 		$expectation->is(q{})->at($text);
 		
 
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A(?:.*\(.*BODYSTRUCTURE \()//i)
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A(?:.*?\(.*?BODYSTRUCTURE \()//i)
 		{
 			
 			$expectation->failed();
@@ -5676,11 +4514,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::start
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {
-	    #print STDERR "item = ",Data::Dumper->Dump([\%item],['$item']);
-	    $return = $item{'part(1)'}[0];
-	    $return || defined $return;
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = $item{'part(1)'}[0] };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -5696,7 +4530,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::start
 		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [/.*\\(.*BODYSTRUCTURE \\(/i part /\\).*\\)\\r?\\n?/]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [/.*?\\(.*?BODYSTRUCTURE \\(/i part /\\).*\\)\\r?\\n?/]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{start},
 					  $tracelevel)
@@ -5835,7 +4669,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::RFC822
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = "RFC822" 	};
+		$_tok = ($_noactions) ? 0 : do { $return = "RFC822" };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -6191,16 +5025,13 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::textmessage
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { 
+		$_tok = ($_noactions) ? 0 : do {
 	  $return = $item{basicfields} || {};
 	  $return->{bodytype} = 'TEXT';
-          foreach my $what (qw/textlines(?) bodyMD5(?) bodydisp(?) bodylang(?)/)
-	  {   my $k = $what; $k =~ s/\(\?\)$//;
-	      $return->{$k} = $item{$what}[0] if ref $item{$what};
-	  }
-
-	  $return;
-        };
+	  take_optional_items($return, \%item
+            , qw/textlines bodyMD5 bodydisp bodylang bodyextra/);
+	  1;
+	};
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -6437,28 +5268,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyid
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyid},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING} ; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -6672,7 +5481,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyextra
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: ['(' STRING ')']},
+		Parse::RecDescent::_trace(q{Trying production: [STRINGS]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{bodyextra},
 					  $tracelevel)
@@ -6685,114 +5494,38 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyextra
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyextra},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [STRING]},
+		Parse::RecDescent::_trace(q{Trying subrule: [STRINGS]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{bodyextra},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		$expectation->is(q{STRING})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING, 1, 100000000, $_noactions,$expectation,undef))) 
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRINGS($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [STRING]>>},
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [STRINGS]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{bodyextra},
 						  $tracelevel)
 							if defined $::RD_TRACE;
+			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [STRING]<< (}
-					. @$_tok . q{ times)},
+		Parse::RecDescent::_trace(q{>>Matched subrule: [STRINGS]<< (return value: [}
+					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodyextra},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{STRING(s)}} = $_tok;
+		$item{q{STRINGS}} = $_tok;
 		push @item, $_tok;
 		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyextra},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodyextra},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { 0 };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' STRING ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [STRINGS]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodyextra},
 					  $tracelevel)
@@ -7078,14 +5811,11 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::othertypemessage
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = {}; 
-	  foreach my $what ( qw/bodytype bodyparms(?) bodydisp(?)/
-	                   , qw/bodylang(?) bodyextra(?)/ )
-	  {   my $k = $what; $k =~ s/\(\?\)$//;
-	      $return->{$k} = ref($item{$what})? $item{$what}[0] : $item{$what} ;
-	  }
-	  while( my($k,$v) = each %{$item{basicfields}} ) { $return->{$k} = $v }
-	  $return;
+		$_tok = ($_noactions) ? 0 : do { $return = { bodytype => $item{bodytype} };
+	  take_optional_items($return, \%item
+             , qw/bodyparms bodydisp bodylang bodyextra/ );
+	  merge_hash($return, $item{basicfields});
+	  1;
 	};
 		unless (defined $_tok)
 		{
@@ -7304,7 +6034,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::kvpair
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = { $item{key} => $item{value} }; $return||defined($return);};
+		$_tok = ($_noactions) ? 0 : do { $return = { $item{key} => $item{value} } };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -7541,28 +6271,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodysize
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodysize},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{NUMBER}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [NUMBER]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -7658,7 +6366,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [QUOTED_STRING]},
+		Parse::RecDescent::_trace(q{Trying production: [DOUBLE_QUOTED_STRING]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{STRING},
 					  $tracelevel)
@@ -7671,17 +6379,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [QUOTED_STRING]},
+		Parse::RecDescent::_trace(q{Trying subrule: [DOUBLE_QUOTED_STRING]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{STRING},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::QUOTED_STRING($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::DOUBLE_QUOTED_STRING($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [QUOTED_STRING]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [DOUBLE_QUOTED_STRING]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{STRING},
 						  $tracelevel)
@@ -7689,20 +6397,79 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [QUOTED_STRING]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [DOUBLE_QUOTED_STRING]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{STRING},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{QUOTED_STRING}} = $_tok;
+		$item{q{DOUBLE_QUOTED_STRING}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [QUOTED_STRING]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [DOUBLE_QUOTED_STRING]<<},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRING},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$_matched = 1;
+		last;
+	}
+
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: [SINGLE_QUOTED_STRING]},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{STRING},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[1];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{STRING});
+		%item = (__RULE__ => q{STRING});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying subrule: [SINGLE_QUOTED_STRING]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{STRING},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::SINGLE_QUOTED_STRING($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [SINGLE_QUOTED_STRING]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{STRING},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [SINGLE_QUOTED_STRING]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRING},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{SINGLE_QUOTED_STRING}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+
+		Parse::RecDescent::_trace(q{>>Matched production: [SINGLE_QUOTED_STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{STRING},
 					  $tracelevel)
@@ -7722,7 +6489,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING
 					  q{STRING},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
+		my $thisprod = $thisrule->{"prods"}[2];
 		$text = $_[1];
 		my $_savetext;
 		@item = (q{STRING});
@@ -7760,31 +6527,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{STRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do {
-	 $return = $item{QUOTED_STRING}||$item{BARESTRING} ;
-	 $return||defined($return);
-};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [BARESTRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -7923,28 +6665,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodytype
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodytype},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{STRING} ; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -8085,7 +6805,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::TEXT
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = "TEXT" };
+		$_tok = ($_noactions) ? 0 : do { $return = "TEXT"   };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -8195,7 +6915,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::to
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+		Parse::RecDescent::_trace(q{Trying production: [ADDRESSES]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{to},
 					  $tracelevel)
@@ -8208,17 +6928,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::to
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+		Parse::RecDescent::_trace(q{Trying subrule: [ADDRESSES]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{to},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [ADDRESSES]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{to},
 						  $tracelevel)
@@ -8226,155 +6946,20 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::to
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [ADDRESSES]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{to},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{NIL}} = $_tok;
+		$item{q{ADDRESSES}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{to},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{to},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{to});
-		%item = (__RULE__ => q{to});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{to},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{to},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{addressstruct})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{to},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{to},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{addressstruct(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{to},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{to},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'addressstruct(s)'} };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [ADDRESSES]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{to},
 					  $tracelevel)
@@ -8513,7 +7098,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = "NIL" 	};
+		$_tok = ($_noactions) ? 0 : do { $return = "NIL"    };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -8580,6 +7165,220 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL
 	return $return;
 }
 
+# ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
+sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::KVPAIRS
+{
+	my $thisparser = $_[0];
+	use vars q{$tracelevel};
+	local $tracelevel = ($tracelevel||0)+1;
+	$ERRORS = 0;
+	my $thisrule = $thisparser->{"rules"}{"KVPAIRS"};
+	
+	Parse::RecDescent::_trace(q{Trying rule: [KVPAIRS]},
+				  Parse::RecDescent::_tracefirst($_[1]),
+				  q{KVPAIRS},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+
+	my $def_at = @{$thisparser->{deferred}};
+	my $err_at = @{$thisparser->{errors}};
+
+	my $score;
+	my $score_return;
+	my $_tok;
+	my $return = undef;
+	my $_matched=0;
+	my $commit=0;
+	my @item = ();
+	my %item = ();
+	my $repeating =  defined($_[2]) && $_[2];
+	my $_noactions = defined($_[3]) && $_[3];
+ 	my @arg =        defined $_[4] ? @{ &{$_[4]} } : ();
+	my %arg =        ($#arg & 01) ? @arg : (@arg, undef);
+	my $text;
+	my $lastsep="";
+	my $expectation = new Parse::RecDescent::Expectation($thisrule->expected());
+	$expectation->at($_[1]);
+	
+	my $thisline;
+	tie $thisline, q{Parse::RecDescent::LineCounter}, \$text, $thisparser;
+
+	
+
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: ['(' kvpair ')']},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[0];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{KVPAIRS});
+		%item = (__RULE__ => q{KVPAIRS});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$lastsep = "";
+		$expectation->is(q{})->at($text);
+		
+
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
+		     substr($text,0,length($_tok)) eq $_tok and
+		     do { substr($text,0,length($_tok)) = ""; 1; }
+		)
+		{
+			
+			$expectation->failed();
+			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
+						. $_tok . q{])},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		push @item, $item{__STRING1__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [kvpair]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{KVPAIRS},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{kvpair})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::kvpair, 1, 100000000, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [kvpair]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{KVPAIRS},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [kvpair]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{kvpair(s)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying terminal: [')']},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$lastsep = "";
+		$expectation->is(q{')'})->at($text);
+		
+
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
+		     substr($text,0,length($_tok)) eq $_tok and
+		     do { substr($text,0,length($_tok)) = ""; 1; }
+		)
+		{
+			
+			$expectation->failed();
+			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
+						. $_tok . q{])},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		push @item, $item{__STRING2__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying action},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		
+
+		$_tok = ($_noactions) ? 0 : do { $return = { map { (%$_) } @{$item{'kvpair(s)'}} } };
+		unless (defined $_tok)
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
+					if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
+					  . $_tok . q{])},
+					  Parse::RecDescent::_tracefirst($text))
+						if defined $::RD_TRACE;
+		push @item, $_tok;
+		$item{__ACTION1__}=$_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{>>Matched production: ['(' kvpair ')']<<},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$_matched = 1;
+		last;
+	}
+
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+        unless ( $_matched || defined($return) || defined($score) )
+	{
+				splice @{$thisparser->{deferred}}, $def_at;
+			  
+
+		$_[1] = $text;	# NOT SURE THIS IS NEEDED
+		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
+					 Parse::RecDescent::_tracefirst($_[1]),
+					 q{KVPAIRS},
+					 $tracelevel)
+					if defined $::RD_TRACE;
+		return undef;
+	}
+	if (!defined($return) && defined($score))
+	{
+		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
+					  q{KVPAIRS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$return = $score_return;
+	}
+	splice @{$thisparser->{errors}}, $err_at;
+	$return = $item[$#item] unless defined $return;
+	if (defined $::RD_TRACE)
+	{
+		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
+					  $return . q{])}, "",
+					  q{KVPAIRS},
+					  $tracelevel);
+		Parse::RecDescent::_trace(q{(consumed: [} .
+					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
+					  Parse::RecDescent::_tracefirst($text),
+					  , q{KVPAIRS},
+					  $tracelevel)
+	}
+	$_[1] = $text;
+	return $return;
+}
+
 # ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
 sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::from
 {
@@ -8623,7 +7422,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::from
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+		Parse::RecDescent::_trace(q{Trying production: [ADDRESSES]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{from},
 					  $tracelevel)
@@ -8636,17 +7435,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::from
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+		Parse::RecDescent::_trace(q{Trying subrule: [ADDRESSES]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{from},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [ADDRESSES]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{from},
 						  $tracelevel)
@@ -8654,155 +7453,20 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::from
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [ADDRESSES]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{from},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{NIL}} = $_tok;
+		$item{q{ADDRESSES}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{from},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{from},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{from});
-		%item = (__RULE__ => q{from});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{from},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{from},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{addressstruct})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{from},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{from},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{addressstruct(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{from},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{from},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'addressstruct(s)'} };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [ADDRESSES]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{from},
 					  $tracelevel)
@@ -9000,9 +7664,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodystructure
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {   $return = $item{'part(s)'} ;
-	    $return||defined($return);
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = $item{'part(s)'} };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -9157,7 +7819,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::PLAIN
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = "PLAIN" };
+		$_tok = ($_noactions) ? 0 : do { $return = "PLAIN"  };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -9312,7 +7974,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NUMBER
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = $item[1]; $return||defined($return);};
+		$_tok = ($_noactions) ? 0 : do { $return = $item[1] };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -9379,6 +8041,220 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NUMBER
 	return $return;
 }
 
+# ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
+sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRINGS
+{
+	my $thisparser = $_[0];
+	use vars q{$tracelevel};
+	local $tracelevel = ($tracelevel||0)+1;
+	$ERRORS = 0;
+	my $thisrule = $thisparser->{"rules"}{"STRINGS"};
+	
+	Parse::RecDescent::_trace(q{Trying rule: [STRINGS]},
+				  Parse::RecDescent::_tracefirst($_[1]),
+				  q{STRINGS},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+
+	my $def_at = @{$thisparser->{deferred}};
+	my $err_at = @{$thisparser->{errors}};
+
+	my $score;
+	my $score_return;
+	my $_tok;
+	my $return = undef;
+	my $_matched=0;
+	my $commit=0;
+	my @item = ();
+	my %item = ();
+	my $repeating =  defined($_[2]) && $_[2];
+	my $_noactions = defined($_[3]) && $_[3];
+ 	my @arg =        defined $_[4] ? @{ &{$_[4]} } : ();
+	my %arg =        ($#arg & 01) ? @arg : (@arg, undef);
+	my $text;
+	my $lastsep="";
+	my $expectation = new Parse::RecDescent::Expectation($thisrule->expected());
+	$expectation->at($_[1]);
+	
+	my $thisline;
+	tie $thisline, q{Parse::RecDescent::LineCounter}, \$text, $thisparser;
+
+	
+
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: ['(' STRING ')']},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[0];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{STRINGS});
+		%item = (__RULE__ => q{STRINGS});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$lastsep = "";
+		$expectation->is(q{})->at($text);
+		
+
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
+		     substr($text,0,length($_tok)) eq $_tok and
+		     do { substr($text,0,length($_tok)) = ""; 1; }
+		)
+		{
+			
+			$expectation->failed();
+			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
+						. $_tok . q{])},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		push @item, $item{__STRING1__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [STRING]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{STRINGS},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{STRING})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING, 1, 100000000, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [STRING]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{STRINGS},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [STRING]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{STRING(s)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying terminal: [')']},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$lastsep = "";
+		$expectation->is(q{')'})->at($text);
+		
+
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
+		     substr($text,0,length($_tok)) eq $_tok and
+		     do { substr($text,0,length($_tok)) = ""; 1; }
+		)
+		{
+			
+			$expectation->failed();
+			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
+						. $_tok . q{])},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		push @item, $item{__STRING2__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying action},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		
+
+		$_tok = ($_noactions) ? 0 : do { $return = $item{'STRING(s)'} };
+		unless (defined $_tok)
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
+					if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
+					  . $_tok . q{])},
+					  Parse::RecDescent::_tracefirst($text))
+						if defined $::RD_TRACE;
+		push @item, $_tok;
+		$item{__ACTION1__}=$_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{>>Matched production: ['(' STRING ')']<<},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$_matched = 1;
+		last;
+	}
+
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+        unless ( $_matched || defined($return) || defined($score) )
+	{
+				splice @{$thisparser->{deferred}}, $def_at;
+			  
+
+		$_[1] = $text;	# NOT SURE THIS IS NEEDED
+		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
+					 Parse::RecDescent::_tracefirst($_[1]),
+					 q{STRINGS},
+					 $tracelevel)
+					if defined $::RD_TRACE;
+		return undef;
+	}
+	if (!defined($return) && defined($score))
+	{
+		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
+					  q{STRINGS},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$return = $score_return;
+	}
+	splice @{$thisparser->{errors}}, $err_at;
+	$return = $item[$#item] unless defined $return;
+	if (defined $::RD_TRACE)
+	{
+		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
+					  $return . q{])}, "",
+					  q{STRINGS},
+					  $tracelevel);
+		Parse::RecDescent::_trace(q{(consumed: [} .
+					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
+					  Parse::RecDescent::_tracefirst($text),
+					  , q{STRINGS},
+					  $tracelevel)
+	}
+	$_[1] = $text;
+	return $return;
+}
+
 # ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
 sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::HTML
 {
@@ -9467,7 +8343,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::HTML
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = "HTML" };
+		$_tok = ($_noactions) ? 0 : do { $return = "HTML"   };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -9636,7 +8512,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydisp
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: ['(' kvpair ')']},
+		Parse::RecDescent::_trace(q{Trying production: [KVPAIRS]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{bodydisp},
 					  $tracelevel)
@@ -9649,112 +8525,38 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydisp
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodydisp},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\(//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [kvpair]},
+		Parse::RecDescent::_trace(q{Trying subrule: [KVPAIRS]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{bodydisp},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		$expectation->is(q{kvpair})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::kvpair, 1, 100000000, $_noactions,$expectation,undef))) 
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::KVPAIRS($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [kvpair]>>},
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [KVPAIRS]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{bodydisp},
 						  $tracelevel)
 							if defined $::RD_TRACE;
+			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [kvpair]<< (}
-					. @$_tok . q{ times)},
+		Parse::RecDescent::_trace(q{>>Matched subrule: [KVPAIRS]<< (return value: [}
+					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodydisp},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{kvpair(s)}} = $_tok;
+		$item{q{KVPAIRS}} = $_tok;
 		push @item, $_tok;
 		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodydisp},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A\)//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(qq{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodydisp},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do {
-                          $return = $item{NIL} || 
-                                    { map { (%$_) } @{$item{'kvpair(s)'}} };
-                          $return || defined($return); 
-                        };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' kvpair ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [KVPAIRS]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodydisp},
 					  $tracelevel)
@@ -9848,7 +8650,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [subpart <commit> basicfields bodyparms bodydisp bodylang bodyextra <defer:{  $subpartCount = 0 }>]},
+		Parse::RecDescent::_trace(q{Trying production: [multipart]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{part},
 					  $tracelevel)
@@ -9861,71 +8663,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [subpart]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{part},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::subpart, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [subpart]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{part},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [subpart]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{subpart(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		
-
-		Parse::RecDescent::_trace(q{Trying directive: [<commit>]},
-					Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE; 
-		$_tok = do { $commit = 1 };
-		if (defined($_tok))
-		{
-			Parse::RecDescent::_trace(q{>>Matched directive<< (return value: [}
-						. $_tok . q{])},
-						Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		}
-		else
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match directive>>},
-						Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		}
-		
-		last unless defined $_tok;
-		push @item, $item{__DIRECTIVE1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying subrule: [basicfields]},
+		Parse::RecDescent::_trace(q{Trying subrule: [multipart]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{part},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
-		$expectation->is(q{basicfields})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::basicfields($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::multipart($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [basicfields]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [multipart]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{part},
 						  $tracelevel)
@@ -9933,156 +8681,18 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [basicfields]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [multipart]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{part},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{basicfields}} = $_tok;
+		$item{q{multipart}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyparms]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{part},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{bodyparms})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms, 0, 1, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyparms]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{part},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyparms]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodyparms(?)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodydisp]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{part},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{bodydisp})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydisp, 0, 1, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodydisp]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{part},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodydisp]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodydisp(?)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodylang]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{part},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{bodylang})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodylang, 0, 1, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodylang]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{part},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodylang]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodylang(?)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyextra]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{part},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{bodyextra})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyextra, 0, 1, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyextra]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{part},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyextra]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{bodyextra(?)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		
-
-		Parse::RecDescent::_trace(q{Trying directive: [<defer:{  $subpartCount = 0 }>]},
-					Parse::RecDescent::_tracefirst($text),
-					  q{part},
-					  $tracelevel)
-						if defined $::RD_TRACE; 
-		$_tok = do { push @{$thisparser->{deferred}}, sub {  $subpartCount = 0 }; };
-		if (defined($_tok))
-		{
-			Parse::RecDescent::_trace(q{>>Matched directive<< (return value: [}
-						. $_tok . q{])},
-						Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		}
-		else
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match directive>>},
-						Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		}
-		
-		last unless defined $_tok;
-		push @item, $item{__DIRECTIVE2__}=$_tok;
-		
-
 		Parse::RecDescent::_trace(q{Trying action},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{part},
@@ -10090,15 +8700,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {   $return = bless $item{basicfields},"Mail::IMAPClient::BodyStructure";
-	    $return->{bodytype} = "MULTIPART";
-	    $return->{bodystructure} = $item{'subpart(s)'};
-	    foreach my $b (qw/bodyparms(?) bodydisp(?) bodylang(?) bodyextra(?)/)
-	    {   my $k = $b; $k =~ s/\(\?\)$//;
-	        $return->{$k} = ref($item{$b}) ? $item{$b}[0] : $item{$b};
-	    }
-	    $return;
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = bless $item{multipart}, $mibs };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -10114,7 +8716,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [subpart <commit> basicfields bodyparms bodydisp bodylang bodyextra <defer:{  $subpartCount = 0 }>]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [multipart]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{part},
 					  $tracelevel)
@@ -10179,9 +8781,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {  $return = bless $item{textmessage}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = bless $item{textmessage}, $mibs };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -10212,7 +8812,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [messagerfc822message]},
+		Parse::RecDescent::_trace(q{Trying production: [nestedmessage]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{part},
 					  $tracelevel)
@@ -10225,17 +8825,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [messagerfc822message]},
+		Parse::RecDescent::_trace(q{Trying subrule: [nestedmessage]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{part},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::messagerfc822message($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::nestedmessage($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [messagerfc822message]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [nestedmessage]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{part},
 						  $tracelevel)
@@ -10243,14 +8843,14 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [messagerfc822message]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [nestedmessage]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{part},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{messagerfc822message}} = $_tok;
+		$item{q{nestedmessage}} = $_tok;
 		push @item, $_tok;
 		
 		}
@@ -10262,9 +8862,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {  $return = bless $item{messagerfc822message}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = bless $item{nestedmessage}, $mibs };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -10280,7 +8878,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [messagerfc822message]<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [nestedmessage]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{part},
 					  $tracelevel)
@@ -10345,9 +8943,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {  $return = bless $item{othertypemessage}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	};
+		$_tok = ($_noactions) ? 0 : do { $return = bless $item{othertypemessage}, $mibs };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -10414,6 +9010,553 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::part
 	return $return;
 }
 
+# ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
+sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::nestedmessage
+{
+	my $thisparser = $_[0];
+	use vars q{$tracelevel};
+	local $tracelevel = ($tracelevel||0)+1;
+	$ERRORS = 0;
+	my $thisrule = $thisparser->{"rules"}{"nestedmessage"};
+	
+	Parse::RecDescent::_trace(q{Trying rule: [nestedmessage]},
+				  Parse::RecDescent::_tracefirst($_[1]),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+
+	my $def_at = @{$thisparser->{deferred}};
+	my $err_at = @{$thisparser->{errors}};
+
+	my $score;
+	my $score_return;
+	my $_tok;
+	my $return = undef;
+	my $_matched=0;
+	my $commit=0;
+	my @item = ();
+	my %item = ();
+	my $repeating =  defined($_[2]) && $_[2];
+	my $_noactions = defined($_[3]) && $_[3];
+ 	my @arg =        defined $_[4] ? @{ &{$_[4]} } : ();
+	my %arg =        ($#arg & 01) ? @arg : (@arg, undef);
+	my $text;
+	my $lastsep="";
+	my $expectation = new Parse::RecDescent::Expectation($thisrule->expected());
+	$expectation->at($_[1]);
+	
+	my $thisline;
+	tie $thisline, q{Parse::RecDescent::LineCounter}, \$text, $thisparser;
+
+	
+
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: [rfc822message <commit> bodyparms bodyid bodydesc bodyenc bodysize envelopestruct bodystructure textlines bodyMD5 bodydisp bodylang bodyextra]},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[0];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{nestedmessage});
+		%item = (__RULE__ => q{nestedmessage});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying subrule: [rfc822message]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::rfc822message($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [rfc822message]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [rfc822message]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{rfc822message}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		
+
+		Parse::RecDescent::_trace(q{Trying directive: [<commit>]},
+					Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE; 
+		$_tok = do { $commit = 1 };
+		if (defined($_tok))
+		{
+			Parse::RecDescent::_trace(q{>>Matched directive<< (return value: [}
+						. $_tok . q{])},
+						Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		}
+		else
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match directive>>},
+						Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		}
+		
+		last unless defined $_tok;
+		push @item, $item{__DIRECTIVE1__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying subrule: [bodyparms]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{bodyparms})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyparms($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyparms]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyparms]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodyparms}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		Parse::RecDescent::_trace(q{Trying subrule: [bodyid]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{bodyid})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyid($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyid]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyid]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodyid}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		Parse::RecDescent::_trace(q{Trying subrule: [bodydesc]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{bodydesc})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydesc($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodydesc]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [bodydesc]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodydesc}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		Parse::RecDescent::_trace(q{Trying subrule: [bodyenc]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{bodyenc})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyenc($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodyenc]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [bodyenc]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodyenc}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		Parse::RecDescent::_trace(q{Trying subrule: [bodysize]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{bodysize})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodysize($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [bodysize]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [bodysize]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodysize}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [envelopestruct]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{envelopestruct})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelopestruct, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [envelopestruct]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [envelopestruct]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{envelopestruct(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodystructure]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{bodystructure})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodystructure, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodystructure]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodystructure]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodystructure(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [textlines]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{textlines})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::textlines, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [textlines]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [textlines]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{textlines(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyMD5]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{bodyMD5})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyMD5, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyMD5]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyMD5]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodyMD5(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodydisp]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{bodydisp})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodydisp, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodydisp]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodydisp]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodydisp(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodylang]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{bodylang})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodylang, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodylang]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodylang]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodylang(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [bodyextra]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{nestedmessage},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{bodyextra})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodyextra, 0, 1, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [bodyextra]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{nestedmessage},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [bodyextra]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{bodyextra(?)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying action},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		
+
+		$_tok = ($_noactions) ? 0 : do {
+	  $return = {};
+	  $return->{$_} = $item{$_}
+	      for qw/bodyparms bodyid bodydesc bodyenc bodysize/;
+#             envelopestruct bodystructure textlines/;
+
+	  take_optional_items($return, \%item
+, qw/envelopestruct bodystructure textlines/
+	    , qw/bodyMD5 bodydisp bodylang bodyextra/);
+
+	  merge_hash($return, $item{bodystructure}[0]);
+	  merge_hash($return, $item{basicfields});
+	  $return->{bodytype}    = "MESSAGE" ;
+	  $return->{bodysubtype} = "RFC822" ;
+	  1;
+	};
+		unless (defined $_tok)
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
+					if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
+					  . $_tok . q{])},
+					  Parse::RecDescent::_tracefirst($text))
+						if defined $::RD_TRACE;
+		push @item, $_tok;
+		$item{__ACTION1__}=$_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{>>Matched production: [rfc822message <commit> bodyparms bodyid bodydesc bodyenc bodysize envelopestruct bodystructure textlines bodyMD5 bodydisp bodylang bodyextra]<<},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$_matched = 1;
+		last;
+	}
+
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+        unless ( $_matched || defined($return) || defined($score) )
+	{
+				splice @{$thisparser->{deferred}}, $def_at;
+			  
+
+		$_[1] = $text;	# NOT SURE THIS IS NEEDED
+		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
+					 Parse::RecDescent::_tracefirst($_[1]),
+					 q{nestedmessage},
+					 $tracelevel)
+					if defined $::RD_TRACE;
+		return undef;
+	}
+	if (!defined($return) && defined($score))
+	{
+		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
+					  q{nestedmessage},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$return = $score_return;
+	}
+	splice @{$thisparser->{errors}}, $err_at;
+	$return = $item[$#item] unless defined $return;
+	if (defined $::RD_TRACE)
+	{
+		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
+					  $return . q{])}, "",
+					  q{nestedmessage},
+					  $tracelevel);
+		Parse::RecDescent::_trace(q{(consumed: [} .
+					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
+					  Parse::RecDescent::_tracefirst($text),
+					  , q{nestedmessage},
+					  $tracelevel)
+	}
+	$_[1] = $text;
+	return $return;
+}
+
 # ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
 sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::SINGLE_QUOTED_STRING
 {
@@ -10558,11 +9701,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::SINGLE_QUOTED_STR
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {
-
-	$return = $item{__PATTERN1__} ;
-	$return||defined($return);
-};
+		$_tok = ($_noactions) ? 0 : do { $return = $item{__PATTERN1__} };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -10629,6 +9768,279 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::SINGLE_QUOTED_STR
 	return $return;
 }
 
+# ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
+sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES
+{
+	my $thisparser = $_[0];
+	use vars q{$tracelevel};
+	local $tracelevel = ($tracelevel||0)+1;
+	$ERRORS = 0;
+	my $thisrule = $thisparser->{"rules"}{"ADDRESSES"};
+	
+	Parse::RecDescent::_trace(q{Trying rule: [ADDRESSES]},
+				  Parse::RecDescent::_tracefirst($_[1]),
+				  q{ADDRESSES},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+
+	my $def_at = @{$thisparser->{deferred}};
+	my $err_at = @{$thisparser->{errors}};
+
+	my $score;
+	my $score_return;
+	my $_tok;
+	my $return = undef;
+	my $_matched=0;
+	my $commit=0;
+	my @item = ();
+	my %item = ();
+	my $repeating =  defined($_[2]) && $_[2];
+	my $_noactions = defined($_[3]) && $_[3];
+ 	my @arg =        defined $_[4] ? @{ &{$_[4]} } : ();
+	my %arg =        ($#arg & 01) ? @arg : (@arg, undef);
+	my $text;
+	my $lastsep="";
+	my $expectation = new Parse::RecDescent::Expectation($thisrule->expected());
+	$expectation->at($_[1]);
+	
+	my $thisline;
+	tie $thisline, q{Parse::RecDescent::LineCounter}, \$text, $thisparser;
+
+	
+
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[0];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{ADDRESSES});
+		%item = (__RULE__ => q{ADDRESSES});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{ADDRESSES},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		{
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{ADDRESSES},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			$expectation->failed();
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+					. $_tok . q{]},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{NIL}} = $_tok;
+		push @item, $_tok;
+		
+		}
+
+
+		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$_matched = 1;
+		last;
+	}
+
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+	while (!$_matched && !$commit)
+	{
+		
+		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
+					  Parse::RecDescent::_tracefirst($_[1]),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		my $thisprod = $thisrule->{"prods"}[1];
+		$text = $_[1];
+		my $_savetext;
+		@item = (q{ADDRESSES});
+		%item = (__RULE__ => q{ADDRESSES});
+		my $repcount = 0;
+
+
+		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$lastsep = "";
+		$expectation->is(q{})->at($text);
+		
+
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
+		     substr($text,0,length($_tok)) eq $_tok and
+		     do { substr($text,0,length($_tok)) = ""; 1; }
+		)
+		{
+			
+			$expectation->failed();
+			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
+						. $_tok . q{])},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		push @item, $item{__STRING1__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
+				  Parse::RecDescent::_tracefirst($text),
+				  q{ADDRESSES},
+				  $tracelevel)
+					if defined $::RD_TRACE;
+		$expectation->is(q{addressstruct})->at($text);
+		
+		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
+						  Parse::RecDescent::_tracefirst($text),
+						  q{ADDRESSES},
+						  $tracelevel)
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
+					. @$_tok . q{ times)},
+					  
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$item{q{addressstruct(s)}} = $_tok;
+		push @item, $_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{Trying terminal: [')']},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$lastsep = "";
+		$expectation->is(q{')'})->at($text);
+		
+
+		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
+		     substr($text,0,length($_tok)) eq $_tok and
+		     do { substr($text,0,length($_tok)) = ""; 1; }
+		)
+		{
+			
+			$expectation->failed();
+			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
+						. $_tok . q{])},
+						  Parse::RecDescent::_tracefirst($text))
+							if defined $::RD_TRACE;
+		push @item, $item{__STRING2__}=$_tok;
+		
+
+		Parse::RecDescent::_trace(q{Trying action},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		
+
+		$_tok = ($_noactions) ? 0 : do { $return = $item{'addressstruct(s)'} };
+		unless (defined $_tok)
+		{
+			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
+					if defined $::RD_TRACE;
+			last;
+		}
+		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
+					  . $_tok . q{])},
+					  Parse::RecDescent::_tracefirst($text))
+						if defined $::RD_TRACE;
+		push @item, $_tok;
+		$item{__ACTION1__}=$_tok;
+		
+
+
+		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+					  Parse::RecDescent::_tracefirst($text),
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$_matched = 1;
+		last;
+	}
+
+		splice
+				@{$thisparser->{deferred}}, $def_at unless $_matched;
+				  
+        unless ( $_matched || defined($return) || defined($score) )
+	{
+				splice @{$thisparser->{deferred}}, $def_at;
+			  
+
+		$_[1] = $text;	# NOT SURE THIS IS NEEDED
+		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
+					 Parse::RecDescent::_tracefirst($_[1]),
+					 q{ADDRESSES},
+					 $tracelevel)
+					if defined $::RD_TRACE;
+		return undef;
+	}
+	if (!defined($return) && defined($score))
+	{
+		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
+					  q{ADDRESSES},
+					  $tracelevel)
+						if defined $::RD_TRACE;
+		$return = $score_return;
+	}
+	splice @{$thisparser->{errors}}, $err_at;
+	$return = $item[$#item] unless defined $return;
+	if (defined $::RD_TRACE)
+	{
+		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
+					  $return . q{])}, "",
+					  q{ADDRESSES},
+					  $tracelevel);
+		Parse::RecDescent::_trace(q{(consumed: [} .
+					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
+					  Parse::RecDescent::_tracefirst($text),
+					  , q{ADDRESSES},
+					  $tracelevel)
+	}
+	$_[1] = $text;
+	return $return;
+}
+
 # ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
 sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bcc
 {
@@ -10672,7 +10084,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bcc
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+		Parse::RecDescent::_trace(q{Trying production: [ADDRESSES]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{bcc},
 					  $tracelevel)
@@ -10685,17 +10097,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bcc
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+		Parse::RecDescent::_trace(q{Trying subrule: [ADDRESSES]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{bcc},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [ADDRESSES]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{bcc},
 						  $tracelevel)
@@ -10703,155 +10115,20 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bcc
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [ADDRESSES]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bcc},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{NIL}} = $_tok;
+		$item{q{ADDRESSES}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bcc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{bcc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{bcc});
-		%item = (__RULE__ => q{bcc});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bcc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{bcc},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{addressstruct})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{bcc},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bcc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{addressstruct(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bcc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bcc},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'addressstruct(s)'} };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [ADDRESSES]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bcc},
 					  $tracelevel)
@@ -11092,218 +10369,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::rfc822message
 	return $return;
 }
 
-# ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
-sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::OLDSTRING
-{
-	my $thisparser = $_[0];
-	use vars q{$tracelevel};
-	local $tracelevel = ($tracelevel||0)+1;
-	$ERRORS = 0;
-	my $thisrule = $thisparser->{"rules"}{"OLDSTRING"};
-	
-	Parse::RecDescent::_trace(q{Trying rule: [OLDSTRING]},
-				  Parse::RecDescent::_tracefirst($_[1]),
-				  q{OLDSTRING},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-
-	my $def_at = @{$thisparser->{deferred}};
-	my $err_at = @{$thisparser->{errors}};
-
-	my $score;
-	my $score_return;
-	my $_tok;
-	my $return = undef;
-	my $_matched=0;
-	my $commit=0;
-	my @item = ();
-	my %item = ();
-	my $repeating =  defined($_[2]) && $_[2];
-	my $_noactions = defined($_[3]) && $_[3];
- 	my @arg =        defined $_[4] ? @{ &{$_[4]} } : ();
-	my %arg =        ($#arg & 01) ? @arg : (@arg, undef);
-	my $text;
-	my $lastsep="";
-	my $expectation = new Parse::RecDescent::Expectation($thisrule->expected());
-	$expectation->at($_[1]);
-	
-	my $thisline;
-	tie $thisline, q{Parse::RecDescent::LineCounter}, \$text, $thisparser;
-
-	
-
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: [/^"((?:[^"\\\\]|\\\\.)*)"/]},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[0];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{OLDSTRING});
-		%item = (__RULE__ => q{OLDSTRING});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [/^"((?:[^"\\\\]|\\\\.)*)"/]}, Parse::RecDescent::_tracefirst($text),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A(?:^"((?:[^"\\]|\\.)*)")//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-					if defined $::RD_TRACE;
-
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-					if defined $::RD_TRACE;
-		push @item, $item{__PATTERN1__}=$&;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: [/^"((?:[^"\\\\]|\\\\.)*)"/]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: [/^([^ \\(\\)]+)/]},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{OLDSTRING});
-		%item = (__RULE__ => q{OLDSTRING});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [/^([^ \\(\\)]+)/]}, Parse::RecDescent::_tracefirst($text),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   $text =~ s/\A(?:^([^ \(\)]+))//)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-					if defined $::RD_TRACE;
-
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $& . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-					if defined $::RD_TRACE;
-		push @item, $item{__PATTERN1__}=$&;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do {       $item{__PATTERN1__} =~ s/^"(.*)"$/$1/;
-                                $return = $item{__PATTERN1__} || $item{__PATTERN2__} ;
-                                $return||defined($return);
-                        };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: [/^([^ \\(\\)]+)/]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-        unless ( $_matched || defined($return) || defined($score) )
-	{
-				splice @{$thisparser->{deferred}}, $def_at;
-			  
-
-		$_[1] = $text;	# NOT SURE THIS IS NEEDED
-		Parse::RecDescent::_trace(q{<<Didn't match rule>>},
-					 Parse::RecDescent::_tracefirst($_[1]),
-					 q{OLDSTRING},
-					 $tracelevel)
-					if defined $::RD_TRACE;
-		return undef;
-	}
-	if (!defined($return) && defined($score))
-	{
-		Parse::RecDescent::_trace(q{>>Accepted scored production<<}, "",
-					  q{OLDSTRING},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$return = $score_return;
-	}
-	splice @{$thisparser->{errors}}, $err_at;
-	$return = $item[$#item] unless defined $return;
-	if (defined $::RD_TRACE)
-	{
-		Parse::RecDescent::_trace(q{>>Matched rule<< (return value: [} .
-					  $return . q{])}, "",
-					  q{OLDSTRING},
-					  $tracelevel);
-		Parse::RecDescent::_trace(q{(consumed: [} .
-					  Parse::RecDescent::_tracemax(substr($_[1],0,-length($text))) . q{])}, 
-					  Parse::RecDescent::_tracefirst($text),
-					  , q{OLDSTRING},
-					  $tracelevel)
-	}
-	$_[1] = $text;
-	return $return;
-}
-
 # ARGS ARE: ($parser, $text; $repeating, $_noactions, \@args)
 sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct
 {
@@ -11543,13 +10608,12 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { bless {
-			personalname => $item{personalname} ,	
-			sourceroute  => $item{sourceroute} ,	
-			mailboxname  => $item{mailboxname} ,	
-			hostname     => $item{hostname} ,	
-		  }, 'Mail::IMAPClient::BodyStructure::Address';
-		};
+		$_tok = ($_noactions) ? 0 : do { bless { personalname => $item{personalname}
+		, sourceroute  => $item{sourceroute}
+		, mailboxname  => $item{mailboxname}
+		, hostname     => $item{hostname}
+	        }, 'Mail::IMAPClient::BodyStructure::Address';
+	};
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -11761,28 +10825,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::sourceroute
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{sourceroute},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -11984,9 +11026,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::subpart
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do {   $return = $item{part} ; 
-	    $return||defined($return);
-	};
+		$_tok = ($_noactions) ? 0 : do {$return = $item{part}};
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -12224,28 +11264,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::textlines
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{textlines},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item[1] || $item[2]; $return||defined($return); };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [NUMBER]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -12411,9 +11429,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::BARESTRING
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { 
-	$return = $item{__PATTERN1__} ; $return||defined($return);
-};
+		$_tok = ($_noactions) ? 0 : do { $return = $item{__PATTERN1__} };
 		unless (defined $_tok)
 		{
 			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
@@ -12641,7 +11657,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodylang
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: ['(' STRING ')']},
+		Parse::RecDescent::_trace(q{Trying production: [STRINGS]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{bodylang},
 					  $tracelevel)
@@ -12654,114 +11670,38 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::bodylang
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodylang},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [STRING]},
+		Parse::RecDescent::_trace(q{Trying subrule: [STRINGS]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{bodylang},
 				  $tracelevel)
 					if defined $::RD_TRACE;
-		$expectation->is(q{STRING})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRING, 1, 100000000, $_noactions,$expectation,undef))) 
+		if (1) { no strict qw{refs};
+		$expectation->is(q{})->at($text);
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::STRINGS($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [STRING]>>},
+			
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [STRINGS]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{bodylang},
 						  $tracelevel)
 							if defined $::RD_TRACE;
+			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [STRING]<< (}
-					. @$_tok . q{ times)},
+		Parse::RecDescent::_trace(q{>>Matched subrule: [STRINGS]<< (return value: [}
+					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodylang},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{STRING(s)}} = $_tok;
+		$item{q{STRINGS}} = $_tok;
 		push @item, $_tok;
 		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodylang},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{bodylang},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'STRING(s)'}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' STRING ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [STRINGS]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{bodylang},
 					  $tracelevel)
@@ -13231,11 +12171,11 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::envelopestruct
 						if defined $::RD_TRACE;
 		
 
-		$_tok = ($_noactions) ? 0 : do { $return = bless {}, "Mail::IMAPClient::BodyStructure::Envelope"; 
+		$_tok = ($_noactions) ? 0 : do { $return = bless {}, "Mail::IMAPClient::BodyStructure::Envelope";
 	  $return->{$_} = $item{$_}
 	     for qw/date subject from sender replyto to cc/
-               , qw/bcc inreplyto messageid/ ;
-	  $return;
+	       , qw/bcc inreplyto messageid/;
+	  1;
 	};
 		unless (defined $_tok)
 		{
@@ -13346,7 +12286,7 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::replyto
 	while (!$_matched && !$commit)
 	{
 		
-		Parse::RecDescent::_trace(q{Trying production: [NIL]},
+		Parse::RecDescent::_trace(q{Trying production: [ADDRESSES]},
 					  Parse::RecDescent::_tracefirst($_[1]),
 					  q{replyto},
 					  $tracelevel)
@@ -13359,17 +12299,17 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::replyto
 		my $repcount = 0;
 
 
-		Parse::RecDescent::_trace(q{Trying subrule: [NIL]},
+		Parse::RecDescent::_trace(q{Trying subrule: [ADDRESSES]},
 				  Parse::RecDescent::_tracefirst($text),
 				  q{replyto},
 				  $tracelevel)
 					if defined $::RD_TRACE;
 		if (1) { no strict qw{refs};
 		$expectation->is(q{})->at($text);
-		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::NIL($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
+		unless (defined ($_tok = Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::ADDRESSES($thisparser,$text,$repeating,$_noactions,sub { \@arg })))
 		{
 			
-			Parse::RecDescent::_trace(q{<<Didn't match subrule: [NIL]>>},
+			Parse::RecDescent::_trace(q{<<Didn't match subrule: [ADDRESSES]>>},
 						  Parse::RecDescent::_tracefirst($text),
 						  q{replyto},
 						  $tracelevel)
@@ -13377,155 +12317,20 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::replyto
 			$expectation->failed();
 			last;
 		}
-		Parse::RecDescent::_trace(q{>>Matched subrule: [NIL]<< (return value: [}
+		Parse::RecDescent::_trace(q{>>Matched subrule: [ADDRESSES]<< (return value: [}
 					. $_tok . q{]},
 					  
 					  Parse::RecDescent::_tracefirst($text),
 					  q{replyto},
 					  $tracelevel)
 						if defined $::RD_TRACE;
-		$item{q{NIL}} = $_tok;
+		$item{q{ADDRESSES}} = $_tok;
 		push @item, $_tok;
 		
 		}
 
 
-		Parse::RecDescent::_trace(q{>>Matched production: [NIL]<<},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{replyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$_matched = 1;
-		last;
-	}
-
-		splice
-				@{$thisparser->{deferred}}, $def_at unless $_matched;
-				  
-	while (!$_matched && !$commit)
-	{
-		
-		Parse::RecDescent::_trace(q{Trying production: ['(' addressstruct ')']},
-					  Parse::RecDescent::_tracefirst($_[1]),
-					  q{replyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		my $thisprod = $thisrule->{"prods"}[1];
-		$text = $_[1];
-		my $_savetext;
-		@item = (q{replyto});
-		%item = (__RULE__ => q{replyto});
-		my $repcount = 0;
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: ['(']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{replyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = "("; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING1__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying repeated subrule: [addressstruct]},
-				  Parse::RecDescent::_tracefirst($text),
-				  q{replyto},
-				  $tracelevel)
-					if defined $::RD_TRACE;
-		$expectation->is(q{addressstruct})->at($text);
-		
-		unless (defined ($_tok = $thisparser->_parserepeat($text, \&Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::addressstruct, 1, 100000000, $_noactions,$expectation,undef))) 
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match repeated subrule: [addressstruct]>>},
-						  Parse::RecDescent::_tracefirst($text),
-						  q{replyto},
-						  $tracelevel)
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched repeated subrule: [addressstruct]<< (}
-					. @$_tok . q{ times)},
-					  
-					  Parse::RecDescent::_tracefirst($text),
-					  q{replyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$item{q{addressstruct(s)}} = $_tok;
-		push @item, $_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{Trying terminal: [')']},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{replyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		$lastsep = "";
-		$expectation->is(q{')'})->at($text);
-		
-
-		unless ($text =~ s/\A($skip)/$lastsep=$1 and ""/e and   do { $_tok = ")"; 1 } and
-		     substr($text,0,length($_tok)) eq $_tok and
-		     do { substr($text,0,length($_tok)) = ""; 1; }
-		)
-		{
-			
-			$expectation->failed();
-			Parse::RecDescent::_trace(q{<<Didn't match terminal>>},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched terminal<< (return value: [}
-						. $_tok . q{])},
-						  Parse::RecDescent::_tracefirst($text))
-							if defined $::RD_TRACE;
-		push @item, $item{__STRING2__}=$_tok;
-		
-
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{replyto},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{'addressstruct(s)'} };
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
-
-		Parse::RecDescent::_trace(q{>>Matched production: ['(' addressstruct ')']<<},
+		Parse::RecDescent::_trace(q{>>Matched production: [ADDRESSES]<<},
 					  Parse::RecDescent::_tracefirst($text),
 					  q{replyto},
 					  $tracelevel)
@@ -13721,28 +12526,6 @@ sub Parse::RecDescent::Mail::IMAPClient::BodyStructure::Parse::mailboxname
 		
 		}
 
-		Parse::RecDescent::_trace(q{Trying action},
-					  Parse::RecDescent::_tracefirst($text),
-					  q{mailboxname},
-					  $tracelevel)
-						if defined $::RD_TRACE;
-		
-
-		$_tok = ($_noactions) ? 0 : do { $return = $item{NIL} || $item{STRING}; $return||defined($return);};
-		unless (defined $_tok)
-		{
-			Parse::RecDescent::_trace(q{<<Didn't match action>> (return value: [undef])})
-					if defined $::RD_TRACE;
-			last;
-		}
-		Parse::RecDescent::_trace(q{>>Matched action<< (return value: [}
-					  . $_tok . q{])},
-					  Parse::RecDescent::_tracefirst($text))
-						if defined $::RD_TRACE;
-		push @item, $_tok;
-		$item{__ACTION1__}=$_tok;
-		
-
 
 		Parse::RecDescent::_trace(q{>>Matched production: [STRING]<<},
 					  Parse::RecDescent::_tracefirst($text),
@@ -13815,7 +12598,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                       'impcount' => 0,
                                                       'calls' => [
                                                                    'NIL',
-                                                                   'kvpair'
+                                                                   'KVPAIRS'
                                                                  ],
                                                       'changed' => 0,
                                                       'opcount' => 0,
@@ -13835,62 +12618,35 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 76
+                                                                                                  'line' => 65
                                                                                                 }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
                                                                             'line' => undef
                                                                           }, 'Parse::RecDescent::Production' ),
                                                                    bless( {
                                                                             'number' => '1',
-                                                                            'strcount' => 2,
+                                                                            'strcount' => 0,
                                                                             'dircount' => 0,
                                                                             'uncommit' => undef,
                                                                             'error' => undef,
                                                                             'patcount' => 0,
-                                                                            'actcount' => 1,
+                                                                            'actcount' => 0,
                                                                             'items' => [
                                                                                          bless( {
-                                                                                                  'pattern' => '(',
-                                                                                                  'hashname' => '__STRING1__',
-                                                                                                  'description' => '\'(\'',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 76
-                                                                                                }, 'Parse::RecDescent::Literal' ),
-                                                                                         bless( {
-                                                                                                  'subrule' => 'kvpair',
-                                                                                                  'expected' => undef,
-                                                                                                  'min' => 1,
-                                                                                                  'argcode' => undef,
-                                                                                                  'max' => 100000000,
+                                                                                                  'subrule' => 'KVPAIRS',
                                                                                                   'matchrule' => 0,
-                                                                                                  'repspec' => 's',
+                                                                                                  'implicit' => undef,
+                                                                                                  'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 76
-                                                                                                }, 'Parse::RecDescent::Repetition' ),
-                                                                                         bless( {
-                                                                                                  'pattern' => ')',
-                                                                                                  'hashname' => '__STRING2__',
-                                                                                                  'description' => '\')\'',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 76
-                                                                                                }, 'Parse::RecDescent::Literal' ),
-                                                                                         bless( {
-                                                                                                  'hashname' => '__ACTION1__',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 77,
-                                                                                                  'code' => '{
-                          $return = $item{NIL} || 
-                                    { map { (%$_) } @{$item{\'kvpair(s)\'}} };
-                          $return || defined($return); 
-                        }'
-                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                                  'line' => 65
+                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
-                                                                            'line' => 76
+                                                                            'line' => 65
                                                                           }, 'Parse::RecDescent::Production' )
                                                                  ],
                                                       'name' => 'bodyparms',
                                                       'vars' => '',
-                                                      'line' => 76
+                                                      'line' => 65
                                                     }, 'Parse::RecDescent::Rule' ),
                               'date' => bless( {
                                                  'impcount' => 0,
@@ -13916,7 +12672,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 146
+                                                                                             'line' => 91
                                                                                            }, 'Parse::RecDescent::Subrule' )
                                                                                   ],
                                                                        'line' => undef
@@ -13928,7 +12684,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                        'uncommit' => undef,
                                                                        'error' => undef,
                                                                        'patcount' => 0,
-                                                                       'actcount' => 1,
+                                                                       'actcount' => 0,
                                                                        'items' => [
                                                                                     bless( {
                                                                                              'subrule' => 'STRING',
@@ -13936,21 +12692,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 146
-                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                    bless( {
-                                                                                             'hashname' => '__ACTION1__',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 147,
-                                                                                             'code' => '{ $return = $item{NIL} || $item{STRING} ;$return||defined($return);}'
-                                                                                           }, 'Parse::RecDescent::Action' )
+                                                                                             'line' => 91
+                                                                                           }, 'Parse::RecDescent::Subrule' )
                                                                                   ],
-                                                                       'line' => 146
+                                                                       'line' => 91
                                                                      }, 'Parse::RecDescent::Production' )
                                                             ],
                                                  'name' => 'date',
                                                  'vars' => '',
-                                                 'line' => 146
+                                                 'line' => 91
                                                }, 'Parse::RecDescent::Rule' ),
                               'bodysubtype' => bless( {
                                                         'impcount' => 0,
@@ -13978,7 +12728,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 72
+                                                                                                    'line' => 53
                                                                                                   }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
                                                                               'line' => undef
@@ -13998,10 +12748,10 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 72
+                                                                                                    'line' => 53
                                                                                                   }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
-                                                                              'line' => 72
+                                                                              'line' => 53
                                                                             }, 'Parse::RecDescent::Production' ),
                                                                      bless( {
                                                                               'number' => '2',
@@ -14018,10 +12768,10 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 72
+                                                                                                    'line' => 53
                                                                                                   }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
-                                                                              'line' => 72
+                                                                              'line' => 53
                                                                             }, 'Parse::RecDescent::Production' ),
                                                                      bless( {
                                                                               'number' => '3',
@@ -14030,7 +12780,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                               'uncommit' => undef,
                                                                               'error' => undef,
                                                                               'patcount' => 0,
-                                                                              'actcount' => 1,
+                                                                              'actcount' => 0,
                                                                               'items' => [
                                                                                            bless( {
                                                                                                     'subrule' => 'STRING',
@@ -14038,23 +12788,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 72
-                                                                                                  }, 'Parse::RecDescent::Subrule' ),
-                                                                                           bless( {
-                                                                                                    'hashname' => '__ACTION1__',
-                                                                                                    'lookahead' => 0,
-                                                                                                    'line' => 73,
-                                                                                                    'code' => '{ $return = $item{PLAIN}||$item{HTML}||$item{NIL}||$item{STRING} ; 
-		  $return||defined($return);
-		}'
-                                                                                                  }, 'Parse::RecDescent::Action' )
+                                                                                                    'line' => 53
+                                                                                                  }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
-                                                                              'line' => 72
+                                                                              'line' => 53
                                                                             }, 'Parse::RecDescent::Production' )
                                                                    ],
                                                         'name' => 'bodysubtype',
                                                         'vars' => '',
-                                                        'line' => 72
+                                                        'line' => 53
                                                       }, 'Parse::RecDescent::Rule' ),
                               'hostname' => bless( {
                                                      'impcount' => 0,
@@ -14080,7 +12822,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 123
+                                                                                                 'line' => 78
                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
                                                                            'line' => undef
@@ -14092,7 +12834,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                            'uncommit' => undef,
                                                                            'error' => undef,
                                                                            'patcount' => 0,
-                                                                           'actcount' => 1,
+                                                                           'actcount' => 0,
                                                                            'items' => [
                                                                                         bless( {
                                                                                                  'subrule' => 'STRING',
@@ -14100,21 +12842,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 123
-                                                                                               }, 'Parse::RecDescent::Subrule' ),
-                                                                                        bless( {
-                                                                                                 'hashname' => '__ACTION1__',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 124,
-                                                                                                 'code' => '{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}'
-                                                                                               }, 'Parse::RecDescent::Action' )
+                                                                                                 'line' => 78
+                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
-                                                                           'line' => 123
+                                                                           'line' => 78
                                                                          }, 'Parse::RecDescent::Production' )
                                                                 ],
                                                      'name' => 'hostname',
                                                      'vars' => '',
-                                                     'line' => 123
+                                                     'line' => 78
                                                    }, 'Parse::RecDescent::Rule' ),
                               'basicfields' => bless( {
                                                         'impcount' => 0,
@@ -14144,16 +12880,19 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 175
+                                                                                                    'line' => 112
                                                                                                   }, 'Parse::RecDescent::Subrule' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodyparms',
-                                                                                                    'matchrule' => 0,
-                                                                                                    'implicit' => undef,
+                                                                                                    'expected' => undef,
+                                                                                                    'min' => 0,
                                                                                                     'argcode' => undef,
+                                                                                                    'max' => 1,
+                                                                                                    'matchrule' => 0,
+                                                                                                    'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 175
-                                                                                                  }, 'Parse::RecDescent::Subrule' ),
+                                                                                                    'line' => 112
+                                                                                                  }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodyid',
                                                                                                     'expected' => undef,
@@ -14163,7 +12902,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 175
+                                                                                                    'line' => 112
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodydesc',
@@ -14174,7 +12913,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 176
+                                                                                                    'line' => 113
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodyenc',
@@ -14185,7 +12924,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 176
+                                                                                                    'line' => 113
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodysize',
@@ -14196,22 +12935,16 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 177
+                                                                                                    'line' => 113
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'hashname' => '__ACTION1__',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 177,
-                                                                                                    'code' => '{ 
-
-	
-	   $return =
-	     { bodysubtype => $item{bodysubtype}
-	     , bodyparms   => $item{bodyparms}
-             };
-           $return->{$_} = ref $item{"$_(?}"} ? $item{"$_(?}"}[0] :$item{"$_(?}"}
-	       for qw/bodyid bodydesc bodyenc bodysize/;
-	   $return;
+                                                                                                    'line' => 114,
+                                                                                                    'code' => '{  $return = { bodysubtype => $item{bodysubtype} };
+	   take_optional_items($return, \\%item,
+	      qw/bodyparms bodyid bodydesc bodyenc bodysize/);
+	   1;
 	}'
                                                                                                   }, 'Parse::RecDescent::Action' )
                                                                                          ],
@@ -14220,7 +12953,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                    ],
                                                         'name' => 'basicfields',
                                                         'vars' => '',
-                                                        'line' => 175
+                                                        'line' => 112
                                                       }, 'Parse::RecDescent::Rule' ),
                               'personalname' => bless( {
                                                          'impcount' => 0,
@@ -14246,7 +12979,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                      'implicit' => undef,
                                                                                                      'argcode' => undef,
                                                                                                      'lookahead' => 0,
-                                                                                                     'line' => 114
+                                                                                                     'line' => 75
                                                                                                    }, 'Parse::RecDescent::Subrule' )
                                                                                           ],
                                                                                'line' => undef
@@ -14258,7 +12991,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                'uncommit' => undef,
                                                                                'error' => undef,
                                                                                'patcount' => 0,
-                                                                               'actcount' => 1,
+                                                                               'actcount' => 0,
                                                                                'items' => [
                                                                                             bless( {
                                                                                                      'subrule' => 'STRING',
@@ -14266,21 +12999,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                      'implicit' => undef,
                                                                                                      'argcode' => undef,
                                                                                                      'lookahead' => 0,
-                                                                                                     'line' => 114
-                                                                                                   }, 'Parse::RecDescent::Subrule' ),
-                                                                                            bless( {
-                                                                                                     'hashname' => '__ACTION1__',
-                                                                                                     'lookahead' => 0,
-                                                                                                     'line' => 115,
-                                                                                                     'code' => '{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}'
-                                                                                                   }, 'Parse::RecDescent::Action' )
+                                                                                                     'line' => 75
+                                                                                                   }, 'Parse::RecDescent::Subrule' )
                                                                                           ],
-                                                                               'line' => 114
+                                                                               'line' => 75
                                                                              }, 'Parse::RecDescent::Production' )
                                                                     ],
                                                          'name' => 'personalname',
                                                          'vars' => '',
-                                                         'line' => 114
+                                                         'line' => 75
                                                        }, 'Parse::RecDescent::Rule' ),
                               'key' => bless( {
                                                 'impcount' => 0,
@@ -14297,7 +13024,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                       'uncommit' => undef,
                                                                       'error' => undef,
                                                                       'patcount' => 0,
-                                                                      'actcount' => 1,
+                                                                      'actcount' => 0,
                                                                       'items' => [
                                                                                    bless( {
                                                                                             'subrule' => 'STRING',
@@ -14305,27 +13032,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                             'implicit' => undef,
                                                                                             'argcode' => undef,
                                                                                             'lookahead' => 0,
-                                                                                            'line' => 60
-                                                                                          }, 'Parse::RecDescent::Subrule' ),
-                                                                                   bless( {
-                                                                                            'hashname' => '__ACTION1__',
-                                                                                            'lookahead' => 0,
-                                                                                            'line' => 60,
-                                                                                            'code' => '{ $return = $item{STRING} ; $return||defined($return);}'
-                                                                                          }, 'Parse::RecDescent::Action' )
+                                                                                            'line' => 55
+                                                                                          }, 'Parse::RecDescent::Subrule' )
                                                                                  ],
                                                                       'line' => undef
                                                                     }, 'Parse::RecDescent::Production' )
                                                            ],
                                                 'name' => 'key',
                                                 'vars' => '',
-                                                'line' => 60
+                                                'line' => 55
                                               }, 'Parse::RecDescent::Rule' ),
                               'cc' => bless( {
                                                'impcount' => 0,
                                                'calls' => [
-                                                            'NIL',
-                                                            'addressstruct'
+                                                            'ADDRESSES'
                                                           ],
                                                'changed' => 0,
                                                'opcount' => 0,
@@ -14340,63 +13060,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                      'actcount' => 0,
                                                                      'items' => [
                                                                                   bless( {
-                                                                                           'subrule' => 'NIL',
+                                                                                           'subrule' => 'ADDRESSES',
                                                                                            'matchrule' => 0,
                                                                                            'implicit' => undef,
                                                                                            'argcode' => undef,
                                                                                            'lookahead' => 0,
-                                                                                           'line' => 149
+                                                                                           'line' => 96
                                                                                          }, 'Parse::RecDescent::Subrule' )
                                                                                 ],
                                                                      'line' => undef
-                                                                   }, 'Parse::RecDescent::Production' ),
-                                                            bless( {
-                                                                     'number' => '1',
-                                                                     'strcount' => 2,
-                                                                     'dircount' => 0,
-                                                                     'uncommit' => undef,
-                                                                     'error' => undef,
-                                                                     'patcount' => 0,
-                                                                     'actcount' => 1,
-                                                                     'items' => [
-                                                                                  bless( {
-                                                                                           'pattern' => '(',
-                                                                                           'hashname' => '__STRING1__',
-                                                                                           'description' => '\'(\'',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 149
-                                                                                         }, 'Parse::RecDescent::InterpLit' ),
-                                                                                  bless( {
-                                                                                           'subrule' => 'addressstruct',
-                                                                                           'expected' => undef,
-                                                                                           'min' => 1,
-                                                                                           'argcode' => undef,
-                                                                                           'max' => 100000000,
-                                                                                           'matchrule' => 0,
-                                                                                           'repspec' => 's',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 149
-                                                                                         }, 'Parse::RecDescent::Repetition' ),
-                                                                                  bless( {
-                                                                                           'pattern' => ')',
-                                                                                           'hashname' => '__STRING2__',
-                                                                                           'description' => '\')\'',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 149
-                                                                                         }, 'Parse::RecDescent::InterpLit' ),
-                                                                                  bless( {
-                                                                                           'hashname' => '__ACTION1__',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 150,
-                                                                                           'code' => '{ $return = $item{NIL} || $item{\'addressstruct(s)\'} }'
-                                                                                         }, 'Parse::RecDescent::Action' )
-                                                                                ],
-                                                                     'line' => 149
                                                                    }, 'Parse::RecDescent::Production' )
                                                           ],
                                                'name' => 'cc',
                                                'vars' => '',
-                                               'line' => 149
+                                               'line' => 96
                                              }, 'Parse::RecDescent::Rule' ),
                               'bodyMD5' => bless( {
                                                     'impcount' => 0,
@@ -14422,7 +13099,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 105
+                                                                                                'line' => 71
                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
                                                                           'line' => undef
@@ -14434,7 +13111,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                           'uncommit' => undef,
                                                                           'error' => undef,
                                                                           'patcount' => 0,
-                                                                          'actcount' => 1,
+                                                                          'actcount' => 0,
                                                                           'items' => [
                                                                                        bless( {
                                                                                                 'subrule' => 'STRING',
@@ -14442,21 +13119,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 105
-                                                                                              }, 'Parse::RecDescent::Subrule' ),
-                                                                                       bless( {
-                                                                                                'hashname' => '__ACTION1__',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 106,
-                                                                                                'code' => '{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}'
-                                                                                              }, 'Parse::RecDescent::Action' )
+                                                                                                'line' => 71
+                                                                                              }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
-                                                                          'line' => 105
+                                                                          'line' => 71
                                                                         }, 'Parse::RecDescent::Production' )
                                                                ],
                                                     'name' => 'bodyMD5',
                                                     'vars' => '',
-                                                    'line' => 105
+                                                    'line' => 71
                                                   }, 'Parse::RecDescent::Rule' ),
                               'envelope' => bless( {
                                                      'impcount' => 0,
@@ -14476,12 +13147,12 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                            'actcount' => 1,
                                                                            'items' => [
                                                                                         bless( {
-                                                                                                 'pattern' => '.*\\(.*ENVELOPE',
+                                                                                                 'pattern' => '.*?\\(.*?ENVELOPE',
                                                                                                  'hashname' => '__PATTERN1__',
-                                                                                                 'description' => '/.*\\\\(.*ENVELOPE/',
+                                                                                                 'description' => '/.*?\\\\(.*?ENVELOPE/',
                                                                                                  'lookahead' => 0,
                                                                                                  'rdelim' => '/',
-                                                                                                 'line' => 279,
+                                                                                                 'line' => 184,
                                                                                                  'mod' => '',
                                                                                                  'ldelim' => '/'
                                                                                                }, 'Parse::RecDescent::Token' ),
@@ -14491,7 +13162,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 279
+                                                                                                 'line' => 184
                                                                                                }, 'Parse::RecDescent::Subrule' ),
                                                                                         bless( {
                                                                                                  'pattern' => '.*\\)',
@@ -14499,17 +13170,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'description' => '/.*\\\\)/',
                                                                                                  'lookahead' => 0,
                                                                                                  'rdelim' => '/',
-                                                                                                 'line' => 279,
+                                                                                                 'line' => 184,
                                                                                                  'mod' => '',
                                                                                                  'ldelim' => '/'
                                                                                                }, 'Parse::RecDescent::Token' ),
                                                                                         bless( {
                                                                                                  'hashname' => '__ACTION1__',
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 280,
-                                                                                                 'code' => '{   $return = $item{envelopestruct};
-	    $return || defined $return;
-	}'
+                                                                                                 'line' => 185,
+                                                                                                 'code' => '{ $return = $item{envelopestruct} }'
                                                                                                }, 'Parse::RecDescent::Action' )
                                                                                       ],
                                                                            'line' => undef
@@ -14517,7 +13186,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                 ],
                                                      'name' => 'envelope',
                                                      'vars' => '',
-                                                     'line' => 279
+                                                     'line' => 184
                                                    }, 'Parse::RecDescent::Rule' ),
                               'MESSAGE' => bless( {
                                                     'impcount' => 0,
@@ -14540,15 +13209,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'description' => '/^"MESSAGE"|^MESSAGE/i',
                                                                                                 'lookahead' => 0,
                                                                                                 'rdelim' => '/',
-                                                                                                'line' => 15,
+                                                                                                'line' => 32,
                                                                                                 'mod' => 'i',
                                                                                                 'ldelim' => '/'
                                                                                               }, 'Parse::RecDescent::Token' ),
                                                                                        bless( {
                                                                                                 'hashname' => '__ACTION1__',
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 15,
-                                                                                                'code' => '{ $return = "MESSAGE" 	}'
+                                                                                                'line' => 32,
+                                                                                                'code' => '{ $return = "MESSAGE"}'
                                                                                               }, 'Parse::RecDescent::Action' )
                                                                                      ],
                                                                           'line' => undef
@@ -14556,7 +13225,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                ],
                                                     'name' => 'MESSAGE',
                                                     'vars' => '',
-                                                    'line' => 15
+                                                    'line' => 32
                                                   }, 'Parse::RecDescent::Rule' ),
                               'DOUBLE_QUOTED_STRING' => bless( {
                                                                  'impcount' => 0,
@@ -14578,7 +13247,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                              'hashname' => '__STRING1__',
                                                                                                              'description' => '\'"\'',
                                                                                                              'lookahead' => 0,
-                                                                                                             'line' => 28
+                                                                                                             'line' => 40
                                                                                                            }, 'Parse::RecDescent::Literal' ),
                                                                                                     bless( {
                                                                                                              'pattern' => '(?:\\\\"|[^"])*',
@@ -14586,7 +13255,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                              'description' => '/(?:\\\\\\\\"|[^"])*/',
                                                                                                              'lookahead' => 0,
                                                                                                              'rdelim' => '/',
-                                                                                                             'line' => 28,
+                                                                                                             'line' => 40,
                                                                                                              'mod' => '',
                                                                                                              'ldelim' => '/'
                                                                                                            }, 'Parse::RecDescent::Token' ),
@@ -14595,17 +13264,13 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                              'hashname' => '__STRING2__',
                                                                                                              'description' => '\'"\'',
                                                                                                              'lookahead' => 0,
-                                                                                                             'line' => 28
+                                                                                                             'line' => 40
                                                                                                            }, 'Parse::RecDescent::Literal' ),
                                                                                                     bless( {
                                                                                                              'hashname' => '__ACTION1__',
                                                                                                              'lookahead' => 0,
-                                                                                                             'line' => 28,
-                                                                                                             'code' => '{
-
-	 $return = $item{__PATTERN1__} ;
-	 $return||defined($return);
-}'
+                                                                                                             'line' => 40,
+                                                                                                             'code' => '{ $return = $item{__PATTERN1__} }'
                                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                                   ],
                                                                                        'line' => undef
@@ -14613,7 +13278,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                             ],
                                                                  'name' => 'DOUBLE_QUOTED_STRING',
                                                                  'vars' => '',
-                                                                 'line' => 28
+                                                                 'line' => 40
                                                                }, 'Parse::RecDescent::Rule' ),
                               'subject' => bless( {
                                                     'impcount' => 0,
@@ -14639,7 +13304,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 135
+                                                                                                'line' => 88
                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
                                                                           'line' => undef
@@ -14651,7 +13316,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                           'uncommit' => undef,
                                                                           'error' => undef,
                                                                           'patcount' => 0,
-                                                                          'actcount' => 1,
+                                                                          'actcount' => 0,
                                                                           'items' => [
                                                                                        bless( {
                                                                                                 'subrule' => 'STRING',
@@ -14659,32 +13324,23 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 135
-                                                                                              }, 'Parse::RecDescent::Subrule' ),
-                                                                                       bless( {
-                                                                                                'hashname' => '__ACTION1__',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 136,
-                                                                                                'code' => '{ 
-			$return = $item{NIL} || $item{STRING} ;
-			$return||defined($return);
-		}'
-                                                                                              }, 'Parse::RecDescent::Action' )
+                                                                                                'line' => 88
+                                                                                              }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
-                                                                          'line' => 135
+                                                                          'line' => 88
                                                                         }, 'Parse::RecDescent::Production' )
                                                                ],
                                                     'name' => 'subject',
                                                     'vars' => '',
-                                                    'line' => 135
+                                                    'line' => 88
                                                   }, 'Parse::RecDescent::Rule' ),
                               'value' => bless( {
                                                   'impcount' => 0,
                                                   'calls' => [
                                                                'NIL',
-                                                               'kvpair',
                                                                'NUMBER',
-                                                               'STRING'
+                                                               'STRING',
+                                                               'KVPAIRS'
                                                              ],
                                                   'changed' => 0,
                                                   'opcount' => 0,
@@ -14704,57 +13360,13 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                               'implicit' => undef,
                                                                                               'argcode' => undef,
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 61
+                                                                                              'line' => 56
                                                                                             }, 'Parse::RecDescent::Subrule' )
                                                                                    ],
                                                                         'line' => undef
                                                                       }, 'Parse::RecDescent::Production' ),
                                                                bless( {
                                                                         'number' => '1',
-                                                                        'strcount' => 2,
-                                                                        'dircount' => 1,
-                                                                        'uncommit' => undef,
-                                                                        'error' => undef,
-                                                                        'patcount' => 0,
-                                                                        'actcount' => 0,
-                                                                        'items' => [
-                                                                                     bless( {
-                                                                                              'pattern' => '(',
-                                                                                              'hashname' => '__STRING1__',
-                                                                                              'description' => '\'(\'',
-                                                                                              'lookahead' => 0,
-                                                                                              'line' => 61
-                                                                                            }, 'Parse::RecDescent::Literal' ),
-                                                                                     bless( {
-                                                                                              'hashname' => '__DIRECTIVE1__',
-                                                                                              'name' => '<commit>',
-                                                                                              'lookahead' => 0,
-                                                                                              'line' => 61,
-                                                                                              'code' => '$commit = 1'
-                                                                                            }, 'Parse::RecDescent::Directive' ),
-                                                                                     bless( {
-                                                                                              'subrule' => 'kvpair',
-                                                                                              'expected' => undef,
-                                                                                              'min' => 1,
-                                                                                              'argcode' => undef,
-                                                                                              'max' => 100000000,
-                                                                                              'matchrule' => 0,
-                                                                                              'repspec' => 's',
-                                                                                              'lookahead' => 0,
-                                                                                              'line' => 61
-                                                                                            }, 'Parse::RecDescent::Repetition' ),
-                                                                                     bless( {
-                                                                                              'pattern' => ')',
-                                                                                              'hashname' => '__STRING2__',
-                                                                                              'description' => '\')\'',
-                                                                                              'lookahead' => 0,
-                                                                                              'line' => 61
-                                                                                            }, 'Parse::RecDescent::Literal' )
-                                                                                   ],
-                                                                        'line' => 61
-                                                                      }, 'Parse::RecDescent::Production' ),
-                                                               bless( {
-                                                                        'number' => '2',
                                                                         'strcount' => 0,
                                                                         'dircount' => 0,
                                                                         'uncommit' => undef,
@@ -14768,10 +13380,30 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                               'implicit' => undef,
                                                                                               'argcode' => undef,
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 61
+                                                                                              'line' => 56
                                                                                             }, 'Parse::RecDescent::Subrule' )
                                                                                    ],
-                                                                        'line' => 61
+                                                                        'line' => 56
+                                                                      }, 'Parse::RecDescent::Production' ),
+                                                               bless( {
+                                                                        'number' => '2',
+                                                                        'strcount' => 0,
+                                                                        'dircount' => 0,
+                                                                        'uncommit' => undef,
+                                                                        'error' => undef,
+                                                                        'patcount' => 0,
+                                                                        'actcount' => 0,
+                                                                        'items' => [
+                                                                                     bless( {
+                                                                                              'subrule' => 'STRING',
+                                                                                              'matchrule' => 0,
+                                                                                              'implicit' => undef,
+                                                                                              'argcode' => undef,
+                                                                                              'lookahead' => 0,
+                                                                                              'line' => 56
+                                                                                            }, 'Parse::RecDescent::Subrule' )
+                                                                                   ],
+                                                                        'line' => 56
                                                                       }, 'Parse::RecDescent::Production' ),
                                                                bless( {
                                                                         'number' => '3',
@@ -14780,34 +13412,23 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                         'uncommit' => undef,
                                                                         'error' => undef,
                                                                         'patcount' => 0,
-                                                                        'actcount' => 1,
+                                                                        'actcount' => 0,
                                                                         'items' => [
                                                                                      bless( {
-                                                                                              'subrule' => 'STRING',
+                                                                                              'subrule' => 'KVPAIRS',
                                                                                               'matchrule' => 0,
                                                                                               'implicit' => undef,
                                                                                               'argcode' => undef,
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 61
-                                                                                            }, 'Parse::RecDescent::Subrule' ),
-                                                                                     bless( {
-                                                                                              'hashname' => '__ACTION1__',
-                                                                                              'lookahead' => 0,
-                                                                                              'line' => 62,
-                                                                                              'code' => '{ 	$return = $item{NIL} 		|| 
-			$item{NUMBER} 			|| 
-			$item{STRING} 			|| 
-			{ map { (%$_) } @{$item{\'kvpair(s)\'}} } ;
-			$return||defined($return);
-		}'
-                                                                                            }, 'Parse::RecDescent::Action' )
+                                                                                              'line' => 56
+                                                                                            }, 'Parse::RecDescent::Subrule' )
                                                                                    ],
-                                                                        'line' => 61
+                                                                        'line' => 56
                                                                       }, 'Parse::RecDescent::Production' )
                                                              ],
                                                   'name' => 'value',
                                                   'vars' => '',
-                                                  'line' => 61
+                                                  'line' => 56
                                                 }, 'Parse::RecDescent::Rule' ),
                               'inreplyto' => bless( {
                                                       'impcount' => 0,
@@ -14833,7 +13454,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 140
+                                                                                                  'line' => 89
                                                                                                 }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
                                                                             'line' => undef
@@ -14845,7 +13466,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                             'uncommit' => undef,
                                                                             'error' => undef,
                                                                             'patcount' => 0,
-                                                                            'actcount' => 1,
+                                                                            'actcount' => 0,
                                                                             'items' => [
                                                                                          bless( {
                                                                                                   'subrule' => 'STRING',
@@ -14853,21 +13474,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 140
-                                                                                                }, 'Parse::RecDescent::Subrule' ),
-                                                                                         bless( {
-                                                                                                  'hashname' => '__ACTION1__',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 141,
-                                                                                                  'code' => '{ $return = $item{NIL} || $item{STRING} ;$return||defined($return);}'
-                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                                  'line' => 89
+                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
-                                                                            'line' => 140
+                                                                            'line' => 89
                                                                           }, 'Parse::RecDescent::Production' )
                                                                  ],
                                                       'name' => 'inreplyto',
                                                       'vars' => '',
-                                                      'line' => 140
+                                                      'line' => 89
                                                     }, 'Parse::RecDescent::Rule' ),
                               'messageid' => bless( {
                                                       'impcount' => 0,
@@ -14893,7 +13508,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 143
+                                                                                                  'line' => 90
                                                                                                 }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
                                                                             'line' => undef
@@ -14905,7 +13520,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                             'uncommit' => undef,
                                                                             'error' => undef,
                                                                             'patcount' => 0,
-                                                                            'actcount' => 1,
+                                                                            'actcount' => 0,
                                                                             'items' => [
                                                                                          bless( {
                                                                                                   'subrule' => 'STRING',
@@ -14913,27 +13528,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 143
-                                                                                                }, 'Parse::RecDescent::Subrule' ),
-                                                                                         bless( {
-                                                                                                  'hashname' => '__ACTION1__',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 144,
-                                                                                                  'code' => '{ $return = $item{NIL} || $item{STRING} ;$return||defined($return);}'
-                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                                  'line' => 90
+                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
-                                                                            'line' => 143
+                                                                            'line' => 90
                                                                           }, 'Parse::RecDescent::Production' )
                                                                  ],
                                                       'name' => 'messageid',
                                                       'vars' => '',
-                                                      'line' => 143
+                                                      'line' => 90
                                                     }, 'Parse::RecDescent::Rule' ),
                               'sender' => bless( {
                                                    'impcount' => 0,
                                                    'calls' => [
-                                                                'NIL',
-                                                                'addressstruct'
+                                                                'ADDRESSES'
                                                               ],
                                                    'changed' => 0,
                                                    'opcount' => 0,
@@ -14948,316 +13556,146 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                          'actcount' => 0,
                                                                          'items' => [
                                                                                       bless( {
-                                                                                               'subrule' => 'NIL',
+                                                                                               'subrule' => 'ADDRESSES',
                                                                                                'matchrule' => 0,
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 161
+                                                                                               'line' => 100
                                                                                              }, 'Parse::RecDescent::Subrule' )
                                                                                     ],
                                                                          'line' => undef
-                                                                       }, 'Parse::RecDescent::Production' ),
-                                                                bless( {
-                                                                         'number' => '1',
-                                                                         'strcount' => 2,
-                                                                         'dircount' => 0,
-                                                                         'uncommit' => undef,
-                                                                         'error' => undef,
-                                                                         'patcount' => 0,
-                                                                         'actcount' => 1,
-                                                                         'items' => [
-                                                                                      bless( {
-                                                                                               'pattern' => '(',
-                                                                                               'hashname' => '__STRING1__',
-                                                                                               'description' => '\'(\'',
-                                                                                               'lookahead' => 0,
-                                                                                               'line' => 161
-                                                                                             }, 'Parse::RecDescent::InterpLit' ),
-                                                                                      bless( {
-                                                                                               'subrule' => 'addressstruct',
-                                                                                               'expected' => undef,
-                                                                                               'min' => 1,
-                                                                                               'argcode' => undef,
-                                                                                               'max' => 100000000,
-                                                                                               'matchrule' => 0,
-                                                                                               'repspec' => 's',
-                                                                                               'lookahead' => 0,
-                                                                                               'line' => 161
-                                                                                             }, 'Parse::RecDescent::Repetition' ),
-                                                                                      bless( {
-                                                                                               'pattern' => ')',
-                                                                                               'hashname' => '__STRING2__',
-                                                                                               'description' => '\')\'',
-                                                                                               'lookahead' => 0,
-                                                                                               'line' => 161
-                                                                                             }, 'Parse::RecDescent::InterpLit' ),
-                                                                                      bless( {
-                                                                                               'hashname' => '__ACTION1__',
-                                                                                               'lookahead' => 0,
-                                                                                               'line' => 162,
-                                                                                               'code' => '{ $return = $item{NIL} || $item{\'addressstruct(s)\'} }'
-                                                                                             }, 'Parse::RecDescent::Action' )
-                                                                                    ],
-                                                                         'line' => 161
                                                                        }, 'Parse::RecDescent::Production' )
                                                               ],
                                                    'name' => 'sender',
                                                    'vars' => '',
-                                                   'line' => 161
+                                                   'line' => 100
                                                  }, 'Parse::RecDescent::Rule' ),
-                              'QUOTED_STRING' => bless( {
-                                                          'impcount' => 0,
-                                                          'calls' => [
-                                                                       'DOUBLE_QUOTED_STRING',
-                                                                       'SINGLE_QUOTED_STRING'
-                                                                     ],
-                                                          'changed' => 0,
-                                                          'opcount' => 0,
-                                                          'prods' => [
-                                                                       bless( {
-                                                                                'number' => '0',
-                                                                                'strcount' => 0,
-                                                                                'dircount' => 0,
-                                                                                'uncommit' => undef,
-                                                                                'error' => undef,
-                                                                                'patcount' => 0,
-                                                                                'actcount' => 0,
-                                                                                'items' => [
-                                                                                             bless( {
-                                                                                                      'subrule' => 'DOUBLE_QUOTED_STRING',
-                                                                                                      'matchrule' => 0,
-                                                                                                      'implicit' => undef,
-                                                                                                      'argcode' => undef,
-                                                                                                      'lookahead' => 0,
-                                                                                                      'line' => 34
-                                                                                                    }, 'Parse::RecDescent::Subrule' )
-                                                                                           ],
-                                                                                'line' => undef
-                                                                              }, 'Parse::RecDescent::Production' ),
-                                                                       bless( {
-                                                                                'number' => '1',
-                                                                                'strcount' => 0,
-                                                                                'dircount' => 0,
-                                                                                'uncommit' => undef,
-                                                                                'error' => undef,
-                                                                                'patcount' => 0,
-                                                                                'actcount' => 1,
-                                                                                'items' => [
-                                                                                             bless( {
-                                                                                                      'subrule' => 'SINGLE_QUOTED_STRING',
-                                                                                                      'matchrule' => 0,
-                                                                                                      'implicit' => undef,
-                                                                                                      'argcode' => undef,
-                                                                                                      'lookahead' => 0,
-                                                                                                      'line' => 34
-                                                                                                    }, 'Parse::RecDescent::Subrule' ),
-                                                                                             bless( {
-                                                                                                      'hashname' => '__ACTION1__',
-                                                                                                      'lookahead' => 0,
-                                                                                                      'line' => 34,
-                                                                                                      'code' => '{
-
-	 $return = $item{DOUBLE_QUOTED_STRING}||$item{SINGLE_QUOTED_STRING} ;
-	 $return||defined($return);
-}'
-                                                                                                    }, 'Parse::RecDescent::Action' )
-                                                                                           ],
-                                                                                'line' => 34
-                                                                              }, 'Parse::RecDescent::Production' )
-                                                                     ],
-                                                          'name' => 'QUOTED_STRING',
-                                                          'vars' => '',
-                                                          'line' => 34
-                                                        }, 'Parse::RecDescent::Rule' ),
-                              'messagerfc822message' => bless( {
-                                                                 'impcount' => 0,
-                                                                 'calls' => [
-                                                                              'rfc822message',
-                                                                              'bodyparms',
-                                                                              'bodyid',
-                                                                              'bodydesc',
-                                                                              'bodyenc',
-                                                                              'bodysize',
-                                                                              'envelopestruct',
-                                                                              'bodystructure',
-                                                                              'textlines',
-                                                                              'bodyMD5',
-                                                                              'bodydisp',
-                                                                              'bodylang',
-                                                                              'bodyextra'
-                                                                            ],
-                                                                 'changed' => 0,
-                                                                 'opcount' => 0,
-                                                                 'prods' => [
-                                                                              bless( {
-                                                                                       'number' => '0',
-                                                                                       'strcount' => 0,
-                                                                                       'dircount' => 1,
-                                                                                       'uncommit' => undef,
-                                                                                       'error' => undef,
-                                                                                       'patcount' => 0,
-                                                                                       'actcount' => 1,
-                                                                                       'items' => [
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'rfc822message',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'hashname' => '__DIRECTIVE1__',
-                                                                                                             'name' => '<commit>',
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215,
-                                                                                                             'code' => '$commit = 1'
-                                                                                                           }, 'Parse::RecDescent::Directive' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodyparms',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodyid',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodydesc',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodyenc',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodysize',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 215
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'envelopestruct',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 216
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodystructure',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 216
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'textlines',
-                                                                                                             'matchrule' => 0,
-                                                                                                             'implicit' => undef,
-                                                                                                             'argcode' => undef,
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 216
-                                                                                                           }, 'Parse::RecDescent::Subrule' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodyMD5',
-                                                                                                             'expected' => undef,
-                                                                                                             'min' => 0,
-                                                                                                             'argcode' => undef,
-                                                                                                             'max' => 1,
-                                                                                                             'matchrule' => 0,
-                                                                                                             'repspec' => '?',
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 217
-                                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodydisp',
-                                                                                                             'expected' => undef,
-                                                                                                             'min' => 0,
-                                                                                                             'argcode' => undef,
-                                                                                                             'max' => 1,
-                                                                                                             'matchrule' => 0,
-                                                                                                             'repspec' => '?',
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 217
-                                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodylang',
-                                                                                                             'expected' => undef,
-                                                                                                             'min' => 0,
-                                                                                                             'argcode' => undef,
-                                                                                                             'max' => 1,
-                                                                                                             'matchrule' => 0,
-                                                                                                             'repspec' => '?',
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 217
-                                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                                    bless( {
-                                                                                                             'subrule' => 'bodyextra',
-                                                                                                             'expected' => undef,
-                                                                                                             'min' => 0,
-                                                                                                             'argcode' => undef,
-                                                                                                             'max' => 1,
-                                                                                                             'matchrule' => 0,
-                                                                                                             'repspec' => '?',
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 217
-                                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                                    bless( {
-                                                                                                             'hashname' => '__ACTION1__',
-                                                                                                             'lookahead' => 0,
-                                                                                                             'line' => 218,
-                                                                                                             'code' => '{ 
-	  $return = {}; 
-	  foreach my $what (qw/	bodyparms bodyid bodydesc bodyenc bodysize 
-				envelopestruct bodystructure textlines
-				bodyMD5(?) bodydisp(?) bodylang(?) bodyextra(?)
-	  		     /
-	  ) {
-		my $k = $what; $k =~ s/\\(\\?\\)$//;
-                $return->{$k} = ref $item{$what} =~ \'ARRAY\'?
-                                        $item{$what}[0] : $item{$what};
-        }
-        while(my($k,$v) = each %{$item{bodystructure}[0]}) { $return->{$k} = $v}
-        while(my($k,$v) = each %{$item{basicfields}})      { $return->{$k} = $v}
-	$return->{bodytype}    = "MESSAGE" ; 
-	$return->{bodysubtype} = "RFC822" ;
-	$return;
+                              'multipart' => bless( {
+                                                      'impcount' => 0,
+                                                      'calls' => [
+                                                                   'subpart',
+                                                                   'basicfields',
+                                                                   'bodyparms',
+                                                                   'bodydisp',
+                                                                   'bodylang',
+                                                                   'bodyextra'
+                                                                 ],
+                                                      'changed' => 0,
+                                                      'opcount' => 0,
+                                                      'prods' => [
+                                                                   bless( {
+                                                                            'number' => '0',
+                                                                            'strcount' => 0,
+                                                                            'dircount' => 2,
+                                                                            'uncommit' => undef,
+                                                                            'error' => undef,
+                                                                            'patcount' => 0,
+                                                                            'actcount' => 1,
+                                                                            'items' => [
+                                                                                         bless( {
+                                                                                                  'subrule' => 'subpart',
+                                                                                                  'expected' => undef,
+                                                                                                  'min' => 1,
+                                                                                                  'argcode' => undef,
+                                                                                                  'max' => 100000000,
+                                                                                                  'matchrule' => 0,
+                                                                                                  'repspec' => 's',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 160
+                                                                                                }, 'Parse::RecDescent::Repetition' ),
+                                                                                         bless( {
+                                                                                                  'hashname' => '__DIRECTIVE1__',
+                                                                                                  'name' => '<commit>',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 160,
+                                                                                                  'code' => '$commit = 1'
+                                                                                                }, 'Parse::RecDescent::Directive' ),
+                                                                                         bless( {
+                                                                                                  'subrule' => 'basicfields',
+                                                                                                  'matchrule' => 0,
+                                                                                                  'implicit' => undef,
+                                                                                                  'argcode' => undef,
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 160
+                                                                                                }, 'Parse::RecDescent::Subrule' ),
+                                                                                         bless( {
+                                                                                                  'subrule' => 'bodyparms',
+                                                                                                  'expected' => undef,
+                                                                                                  'min' => 0,
+                                                                                                  'argcode' => undef,
+                                                                                                  'max' => 1,
+                                                                                                  'matchrule' => 0,
+                                                                                                  'repspec' => '?',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 161
+                                                                                                }, 'Parse::RecDescent::Repetition' ),
+                                                                                         bless( {
+                                                                                                  'subrule' => 'bodydisp',
+                                                                                                  'expected' => undef,
+                                                                                                  'min' => 0,
+                                                                                                  'argcode' => undef,
+                                                                                                  'max' => 1,
+                                                                                                  'matchrule' => 0,
+                                                                                                  'repspec' => '?',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 161
+                                                                                                }, 'Parse::RecDescent::Repetition' ),
+                                                                                         bless( {
+                                                                                                  'subrule' => 'bodylang',
+                                                                                                  'expected' => undef,
+                                                                                                  'min' => 0,
+                                                                                                  'argcode' => undef,
+                                                                                                  'max' => 1,
+                                                                                                  'matchrule' => 0,
+                                                                                                  'repspec' => '?',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 161
+                                                                                                }, 'Parse::RecDescent::Repetition' ),
+                                                                                         bless( {
+                                                                                                  'subrule' => 'bodyextra',
+                                                                                                  'expected' => undef,
+                                                                                                  'min' => 0,
+                                                                                                  'argcode' => undef,
+                                                                                                  'max' => 1,
+                                                                                                  'matchrule' => 0,
+                                                                                                  'repspec' => '?',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 161
+                                                                                                }, 'Parse::RecDescent::Repetition' ),
+                                                                                         bless( {
+                                                                                                  'hashname' => '__DIRECTIVE2__',
+                                                                                                  'name' => '<defer:{  $subpartCount = 0 }>',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 162,
+                                                                                                  'code' => 'push @{$thisparser->{deferred}}, sub {  $subpartCount = 0 };'
+                                                                                                }, 'Parse::RecDescent::Directive' ),
+                                                                                         bless( {
+                                                                                                  'hashname' => '__ACTION1__',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 163,
+                                                                                                  'code' => '{ $return = $item{basicfields};
+	  $return->{bodytype}      = \'MULTIPART\';
+	  $return->{bodystructure} = $item{\'subpart(s)\'};
+	  take_optional_items($return, \\%item
+              , qw/bodyparms bodydisp bodylang bodyextra/);
+	  1;
 	}'
-                                                                                                           }, 'Parse::RecDescent::Action' )
-                                                                                                  ],
-                                                                                       'line' => undef
-                                                                                     }, 'Parse::RecDescent::Production' )
-                                                                            ],
-                                                                 'name' => 'messagerfc822message',
-                                                                 'vars' => '',
-                                                                 'line' => 214
-                                                               }, 'Parse::RecDescent::Rule' ),
+                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                       ],
+                                                                            'line' => undef
+                                                                          }, 'Parse::RecDescent::Production' )
+                                                                 ],
+                                                      'name' => 'multipart',
+                                                      'vars' => '',
+                                                      'line' => 160
+                                                    }, 'Parse::RecDescent::Rule' ),
                               'bodyenc' => bless( {
                                                     'impcount' => 0,
                                                     'calls' => [
                                                                  'NIL',
                                                                  'STRING',
-                                                                 'kvpair'
+                                                                 'KVPAIRS'
                                                                ],
                                                     'changed' => 0,
                                                     'opcount' => 0,
@@ -15277,7 +13715,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 94
+                                                                                                'line' => 70
                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
                                                                           'line' => undef
@@ -15297,64 +13735,35 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 94
+                                                                                                'line' => 70
                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
-                                                                          'line' => 94
+                                                                          'line' => 70
                                                                         }, 'Parse::RecDescent::Production' ),
                                                                  bless( {
                                                                           'number' => '2',
-                                                                          'strcount' => 2,
+                                                                          'strcount' => 0,
                                                                           'dircount' => 0,
                                                                           'uncommit' => undef,
                                                                           'error' => undef,
                                                                           'patcount' => 0,
-                                                                          'actcount' => 1,
+                                                                          'actcount' => 0,
                                                                           'items' => [
                                                                                        bless( {
-                                                                                                'pattern' => '(',
-                                                                                                'hashname' => '__STRING1__',
-                                                                                                'description' => '\'(\'',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 94
-                                                                                              }, 'Parse::RecDescent::Literal' ),
-                                                                                       bless( {
-                                                                                                'subrule' => 'kvpair',
-                                                                                                'expected' => undef,
-                                                                                                'min' => 1,
-                                                                                                'argcode' => undef,
-                                                                                                'max' => 100000000,
+                                                                                                'subrule' => 'KVPAIRS',
                                                                                                 'matchrule' => 0,
-                                                                                                'repspec' => 's',
+                                                                                                'implicit' => undef,
+                                                                                                'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 94
-                                                                                              }, 'Parse::RecDescent::Repetition' ),
-                                                                                       bless( {
-                                                                                                'pattern' => ')',
-                                                                                                'hashname' => '__STRING2__',
-                                                                                                'description' => '\')\'',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 94
-                                                                                              }, 'Parse::RecDescent::Literal' ),
-                                                                                       bless( {
-                                                                                                'hashname' => '__ACTION1__',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 95,
-                                                                                                'code' => '{
-		$return = $item{NIL} 		|| 
-			  $item{STRING} 	||
-			  { map { (%$_) } @{$item{\'kvpair(s)\'}} };
-		$return||defined($return);
-
-	}'
-                                                                                              }, 'Parse::RecDescent::Action' )
+                                                                                                'line' => 70
+                                                                                              }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
-                                                                          'line' => 94
+                                                                          'line' => 70
                                                                         }, 'Parse::RecDescent::Production' )
                                                                ],
                                                     'name' => 'bodyenc',
                                                     'vars' => '',
-                                                    'line' => 94
+                                                    'line' => 70
                                                   }, 'Parse::RecDescent::Rule' ),
                               'bodydesc' => bless( {
                                                      'impcount' => 0,
@@ -15380,7 +13789,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'description' => '/[()]/',
                                                                                                  'lookahead' => -1,
                                                                                                  'rdelim' => '/',
-                                                                                                 'line' => 91,
+                                                                                                 'line' => 68,
                                                                                                  'mod' => '',
                                                                                                  'ldelim' => '/'
                                                                                                }, 'Parse::RecDescent::Token' ),
@@ -15390,7 +13799,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 91
+                                                                                                 'line' => 68
                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
                                                                            'line' => undef
@@ -15402,7 +13811,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                            'uncommit' => undef,
                                                                            'error' => undef,
                                                                            'patcount' => 0,
-                                                                           'actcount' => 1,
+                                                                           'actcount' => 0,
                                                                            'items' => [
                                                                                         bless( {
                                                                                                  'subrule' => 'STRING',
@@ -15410,21 +13819,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 91
-                                                                                               }, 'Parse::RecDescent::Subrule' ),
-                                                                                        bless( {
-                                                                                                 'hashname' => '__ACTION1__',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 92,
-                                                                                                 'code' => '{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}'
-                                                                                               }, 'Parse::RecDescent::Action' )
+                                                                                                 'line' => 68
+                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
-                                                                           'line' => 91
+                                                                           'line' => 68
                                                                          }, 'Parse::RecDescent::Production' )
                                                                 ],
                                                      'name' => 'bodydesc',
                                                      'vars' => '',
-                                                     'line' => 91
+                                                     'line' => 68
                                                    }, 'Parse::RecDescent::Rule' ),
                               'start' => bless( {
                                                   'impcount' => 0,
@@ -15444,12 +13847,12 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                         'actcount' => 1,
                                                                         'items' => [
                                                                                      bless( {
-                                                                                              'pattern' => '.*\\(.*BODYSTRUCTURE \\(',
+                                                                                              'pattern' => '.*?\\(.*?BODYSTRUCTURE \\(',
                                                                                               'hashname' => '__PATTERN1__',
-                                                                                              'description' => '/.*\\\\(.*BODYSTRUCTURE \\\\(/i',
+                                                                                              'description' => '/.*?\\\\(.*?BODYSTRUCTURE \\\\(/i',
                                                                                               'lookahead' => 0,
                                                                                               'rdelim' => '/',
-                                                                                              'line' => 272,
+                                                                                              'line' => 181,
                                                                                               'mod' => 'i',
                                                                                               'ldelim' => '/'
                                                                                             }, 'Parse::RecDescent::Token' ),
@@ -15462,7 +13865,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                               'matchrule' => 0,
                                                                                               'repspec' => '1',
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 272
+                                                                                              'line' => 181
                                                                                             }, 'Parse::RecDescent::Repetition' ),
                                                                                      bless( {
                                                                                               'pattern' => '\\).*\\)\\r?\\n?',
@@ -15470,19 +13873,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                               'description' => '/\\\\).*\\\\)\\\\r?\\\\n?/',
                                                                                               'lookahead' => 0,
                                                                                               'rdelim' => '/',
-                                                                                              'line' => 272,
+                                                                                              'line' => 181,
                                                                                               'mod' => '',
                                                                                               'ldelim' => '/'
                                                                                             }, 'Parse::RecDescent::Token' ),
                                                                                      bless( {
                                                                                               'hashname' => '__ACTION1__',
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 273,
-                                                                                              'code' => '{
-	    #print STDERR "item = ",Data::Dumper->Dump([\\%item],[\'$item\']);
-	    $return = $item{\'part(1)\'}[0];
-	    $return || defined $return;
-	}'
+                                                                                              'line' => 182,
+                                                                                              'code' => '{ $return = $item{\'part(1)\'}[0] }'
                                                                                             }, 'Parse::RecDescent::Action' )
                                                                                    ],
                                                                         'line' => undef
@@ -15490,7 +13889,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                              ],
                                                   'name' => 'start',
                                                   'vars' => '',
-                                                  'line' => 272
+                                                  'line' => 181
                                                 }, 'Parse::RecDescent::Rule' ),
                               'RFC822' => bless( {
                                                    'impcount' => 0,
@@ -15513,15 +13912,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'description' => '/^"RFC822"|^RFC822/i',
                                                                                                'lookahead' => 0,
                                                                                                'rdelim' => '/',
-                                                                                               'line' => 16,
+                                                                                               'line' => 33,
                                                                                                'mod' => 'i',
                                                                                                'ldelim' => '/'
                                                                                              }, 'Parse::RecDescent::Token' ),
                                                                                       bless( {
                                                                                                'hashname' => '__ACTION1__',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 16,
-                                                                                               'code' => '{ $return = "RFC822" 	}'
+                                                                                               'line' => 33,
+                                                                                               'code' => '{ $return = "RFC822" }'
                                                                                              }, 'Parse::RecDescent::Action' )
                                                                                     ],
                                                                          'line' => undef
@@ -15529,7 +13928,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                               ],
                                                    'name' => 'RFC822',
                                                    'vars' => '',
-                                                   'line' => 16
+                                                   'line' => 33
                                                  }, 'Parse::RecDescent::Rule' ),
                               'textmessage' => bless( {
                                                         'impcount' => 0,
@@ -15560,13 +13959,13 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 189
+                                                                                                    'line' => 120
                                                                                                   }, 'Parse::RecDescent::Subrule' ),
                                                                                            bless( {
                                                                                                     'hashname' => '__DIRECTIVE1__',
                                                                                                     'name' => '<commit>',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 189,
+                                                                                                    'line' => 120,
                                                                                                     'code' => '$commit = 1'
                                                                                                   }, 'Parse::RecDescent::Directive' ),
                                                                                            bless( {
@@ -15575,7 +13974,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 189
+                                                                                                    'line' => 120
                                                                                                   }, 'Parse::RecDescent::Subrule' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'textlines',
@@ -15586,7 +13985,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 189
+                                                                                                    'line' => 120
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodyMD5',
@@ -15597,7 +13996,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 189
+                                                                                                    'line' => 120
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodydisp',
@@ -15608,7 +14007,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 190
+                                                                                                    'line' => 121
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodylang',
@@ -15619,7 +14018,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 190
+                                                                                                    'line' => 121
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'subrule' => 'bodyextra',
@@ -15630,22 +14029,19 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'matchrule' => 0,
                                                                                                     'repspec' => '?',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 190
+                                                                                                    'line' => 121
                                                                                                   }, 'Parse::RecDescent::Repetition' ),
                                                                                            bless( {
                                                                                                     'hashname' => '__ACTION1__',
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 191,
-                                                                                                    'code' => '{ 
+                                                                                                    'line' => 122,
+                                                                                                    'code' => '{
 	  $return = $item{basicfields} || {};
 	  $return->{bodytype} = \'TEXT\';
-          foreach my $what (qw/textlines(?) bodyMD5(?) bodydisp(?) bodylang(?)/)
-	  {   my $k = $what; $k =~ s/\\(\\?\\)$//;
-	      $return->{$k} = $item{$what}[0] if ref $item{$what};
-	  }
-
-	  $return;
-        }'
+	  take_optional_items($return, \\%item
+            , qw/textlines bodyMD5 bodydisp bodylang bodyextra/);
+	  1;
+	}'
                                                                                                   }, 'Parse::RecDescent::Action' )
                                                                                          ],
                                                                               'line' => undef
@@ -15653,7 +14049,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                    ],
                                                         'name' => 'textmessage',
                                                         'vars' => '',
-                                                        'line' => 189
+                                                        'line' => 120
                                                       }, 'Parse::RecDescent::Rule' ),
                               'bodyid' => bless( {
                                                    'impcount' => 0,
@@ -15679,7 +14075,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'description' => '/[()]/',
                                                                                                'lookahead' => -1,
                                                                                                'rdelim' => '/',
-                                                                                               'line' => 88,
+                                                                                               'line' => 67,
                                                                                                'mod' => '',
                                                                                                'ldelim' => '/'
                                                                                              }, 'Parse::RecDescent::Token' ),
@@ -15689,7 +14085,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 88
+                                                                                               'line' => 67
                                                                                              }, 'Parse::RecDescent::Subrule' )
                                                                                     ],
                                                                          'line' => undef
@@ -15701,7 +14097,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                          'uncommit' => undef,
                                                                          'error' => undef,
                                                                          'patcount' => 0,
-                                                                         'actcount' => 1,
+                                                                         'actcount' => 0,
                                                                          'items' => [
                                                                                       bless( {
                                                                                                'subrule' => 'STRING',
@@ -15709,27 +14105,22 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 88
-                                                                                             }, 'Parse::RecDescent::Subrule' ),
-                                                                                      bless( {
-                                                                                               'hashname' => '__ACTION1__',
-                                                                                               'lookahead' => 0,
-                                                                                               'line' => 89,
-                                                                                               'code' => '{ $return = $item{NIL} || $item{STRING} ; $return||defined($return);}'
-                                                                                             }, 'Parse::RecDescent::Action' )
+                                                                                               'line' => 67
+                                                                                             }, 'Parse::RecDescent::Subrule' )
                                                                                     ],
-                                                                         'line' => 88
+                                                                         'line' => 67
                                                                        }, 'Parse::RecDescent::Production' )
                                                               ],
                                                    'name' => 'bodyid',
                                                    'vars' => '',
-                                                   'line' => 88
+                                                   'line' => 67
                                                  }, 'Parse::RecDescent::Rule' ),
                               'bodyextra' => bless( {
                                                       'impcount' => 0,
                                                       'calls' => [
                                                                    'NIL',
-                                                                   'STRING'
+                                                                   'STRING',
+                                                                   'STRINGS'
                                                                  ],
                                                       'changed' => 0,
                                                       'opcount' => 0,
@@ -15749,7 +14140,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 111
+                                                                                                  'line' => 73
                                                                                                 }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
                                                                             'line' => undef
@@ -15769,58 +14160,35 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 111
+                                                                                                  'line' => 73
                                                                                                 }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
-                                                                            'line' => 111
+                                                                            'line' => 73
                                                                           }, 'Parse::RecDescent::Production' ),
                                                                    bless( {
                                                                             'number' => '2',
-                                                                            'strcount' => 2,
+                                                                            'strcount' => 0,
                                                                             'dircount' => 0,
                                                                             'uncommit' => undef,
                                                                             'error' => undef,
                                                                             'patcount' => 0,
-                                                                            'actcount' => 1,
+                                                                            'actcount' => 0,
                                                                             'items' => [
                                                                                          bless( {
-                                                                                                  'pattern' => '(',
-                                                                                                  'hashname' => '__STRING1__',
-                                                                                                  'description' => '\'(\'',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 111
-                                                                                                }, 'Parse::RecDescent::InterpLit' ),
-                                                                                         bless( {
-                                                                                                  'subrule' => 'STRING',
-                                                                                                  'expected' => undef,
-                                                                                                  'min' => 1,
-                                                                                                  'argcode' => undef,
-                                                                                                  'max' => 100000000,
+                                                                                                  'subrule' => 'STRINGS',
                                                                                                   'matchrule' => 0,
-                                                                                                  'repspec' => 's',
+                                                                                                  'implicit' => undef,
+                                                                                                  'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 111
-                                                                                                }, 'Parse::RecDescent::Repetition' ),
-                                                                                         bless( {
-                                                                                                  'pattern' => ')',
-                                                                                                  'hashname' => '__STRING2__',
-                                                                                                  'description' => '\')\'',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 111
-                                                                                                }, 'Parse::RecDescent::InterpLit' ),
-                                                                                         bless( {
-                                                                                                  'hashname' => '__ACTION1__',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 112,
-                                                                                                  'code' => '{ 0 }'
-                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                                  'line' => 73
+                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
-                                                                            'line' => 111
+                                                                            'line' => 73
                                                                           }, 'Parse::RecDescent::Production' )
                                                                  ],
                                                       'name' => 'bodyextra',
                                                       'vars' => '',
-                                                      'line' => 111
+                                                      'line' => 73
                                                     }, 'Parse::RecDescent::Rule' ),
                               'othertypemessage' => bless( {
                                                              'impcount' => 0,
@@ -15850,7 +14218,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                          'implicit' => undef,
                                                                                                          'argcode' => undef,
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 202
+                                                                                                         'line' => 130
                                                                                                        }, 'Parse::RecDescent::Subrule' ),
                                                                                                 bless( {
                                                                                                          'subrule' => 'basicfields',
@@ -15858,7 +14226,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                          'implicit' => undef,
                                                                                                          'argcode' => undef,
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 202
+                                                                                                         'line' => 130
                                                                                                        }, 'Parse::RecDescent::Subrule' ),
                                                                                                 bless( {
                                                                                                          'subrule' => 'bodyparms',
@@ -15869,7 +14237,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                          'matchrule' => 0,
                                                                                                          'repspec' => '?',
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 202
+                                                                                                         'line' => 130
                                                                                                        }, 'Parse::RecDescent::Repetition' ),
                                                                                                 bless( {
                                                                                                          'subrule' => 'bodydisp',
@@ -15880,7 +14248,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                          'matchrule' => 0,
                                                                                                          'repspec' => '?',
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 202
+                                                                                                         'line' => 130
                                                                                                        }, 'Parse::RecDescent::Repetition' ),
                                                                                                 bless( {
                                                                                                          'subrule' => 'bodylang',
@@ -15891,7 +14259,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                          'matchrule' => 0,
                                                                                                          'repspec' => '?',
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 203
+                                                                                                         'line' => 131
                                                                                                        }, 'Parse::RecDescent::Repetition' ),
                                                                                                 bless( {
                                                                                                          'subrule' => 'bodyextra',
@@ -15902,20 +14270,17 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                          'matchrule' => 0,
                                                                                                          'repspec' => '?',
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 203
+                                                                                                         'line' => 131
                                                                                                        }, 'Parse::RecDescent::Repetition' ),
                                                                                                 bless( {
                                                                                                          'hashname' => '__ACTION1__',
                                                                                                          'lookahead' => 0,
-                                                                                                         'line' => 204,
-                                                                                                         'code' => '{ $return = {}; 
-	  foreach my $what ( qw/bodytype bodyparms(?) bodydisp(?)/
-	                   , qw/bodylang(?) bodyextra(?)/ )
-	  {   my $k = $what; $k =~ s/\\(\\?\\)$//;
-	      $return->{$k} = ref($item{$what})? $item{$what}[0] : $item{$what} ;
-	  }
-	  while( my($k,$v) = each %{$item{basicfields}} ) { $return->{$k} = $v }
-	  $return;
+                                                                                                         'line' => 132,
+                                                                                                         'code' => '{ $return = { bodytype => $item{bodytype} };
+	  take_optional_items($return, \\%item
+             , qw/bodyparms bodydisp bodylang bodyextra/ );
+	  merge_hash($return, $item{basicfields});
+	  1;
 	}'
                                                                                                        }, 'Parse::RecDescent::Action' )
                                                                                               ],
@@ -15924,7 +14289,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                         ],
                                                              'name' => 'othertypemessage',
                                                              'vars' => '',
-                                                             'line' => 202
+                                                             'line' => 130
                                                            }, 'Parse::RecDescent::Rule' ),
                               'kvpair' => bless( {
                                                    'impcount' => 0,
@@ -15949,7 +14314,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'hashname' => '__STRING1__',
                                                                                                'description' => '\')\'',
                                                                                                'lookahead' => -1,
-                                                                                               'line' => 68
+                                                                                               'line' => 58
                                                                                              }, 'Parse::RecDescent::InterpLit' ),
                                                                                       bless( {
                                                                                                'subrule' => 'key',
@@ -15957,7 +14322,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 68
+                                                                                               'line' => 58
                                                                                              }, 'Parse::RecDescent::Subrule' ),
                                                                                       bless( {
                                                                                                'subrule' => 'value',
@@ -15965,13 +14330,13 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 68
+                                                                                               'line' => 58
                                                                                              }, 'Parse::RecDescent::Subrule' ),
                                                                                       bless( {
                                                                                                'hashname' => '__ACTION1__',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 69,
-                                                                                               'code' => '{ $return = { $item{key} => $item{value} }; $return||defined($return);}'
+                                                                                               'line' => 59,
+                                                                                               'code' => '{ $return = { $item{key} => $item{value} } }'
                                                                                              }, 'Parse::RecDescent::Action' )
                                                                                     ],
                                                                          'line' => undef
@@ -15979,7 +14344,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                               ],
                                                    'name' => 'kvpair',
                                                    'vars' => '',
-                                                   'line' => 68
+                                                   'line' => 58
                                                  }, 'Parse::RecDescent::Rule' ),
                               'bodysize' => bless( {
                                                      'impcount' => 0,
@@ -16005,7 +14370,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'description' => '/[()]/',
                                                                                                  'lookahead' => -1,
                                                                                                  'rdelim' => '/',
-                                                                                                 'line' => 102,
+                                                                                                 'line' => 69,
                                                                                                  'mod' => '',
                                                                                                  'ldelim' => '/'
                                                                                                }, 'Parse::RecDescent::Token' ),
@@ -16015,7 +14380,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 102
+                                                                                                 'line' => 69
                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
                                                                            'line' => undef
@@ -16027,7 +14392,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                            'uncommit' => undef,
                                                                            'error' => undef,
                                                                            'patcount' => 0,
-                                                                           'actcount' => 1,
+                                                                           'actcount' => 0,
                                                                            'items' => [
                                                                                         bless( {
                                                                                                  'subrule' => 'NUMBER',
@@ -16035,26 +14400,21 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 102
-                                                                                               }, 'Parse::RecDescent::Subrule' ),
-                                                                                        bless( {
-                                                                                                 'hashname' => '__ACTION1__',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 103,
-                                                                                                 'code' => '{ $return = $item{NIL} || $item{NUMBER}; $return||defined($return);}'
-                                                                                               }, 'Parse::RecDescent::Action' )
+                                                                                                 'line' => 69
+                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
-                                                                           'line' => 102
+                                                                           'line' => 69
                                                                          }, 'Parse::RecDescent::Production' )
                                                                 ],
                                                      'name' => 'bodysize',
                                                      'vars' => '',
-                                                     'line' => 102
+                                                     'line' => 69
                                                    }, 'Parse::RecDescent::Rule' ),
                               'STRING' => bless( {
                                                    'impcount' => 0,
                                                    'calls' => [
-                                                                'QUOTED_STRING',
+                                                                'DOUBLE_QUOTED_STRING',
+                                                                'SINGLE_QUOTED_STRING',
                                                                 'BARESTRING'
                                                               ],
                                                    'changed' => 0,
@@ -16070,12 +14430,12 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                          'actcount' => 0,
                                                                          'items' => [
                                                                                       bless( {
-                                                                                               'subrule' => 'QUOTED_STRING',
+                                                                                               'subrule' => 'DOUBLE_QUOTED_STRING',
                                                                                                'matchrule' => 0,
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 44
+                                                                                               'line' => 45
                                                                                              }, 'Parse::RecDescent::Subrule' )
                                                                                     ],
                                                                          'line' => undef
@@ -16087,7 +14447,27 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                          'uncommit' => undef,
                                                                          'error' => undef,
                                                                          'patcount' => 0,
-                                                                         'actcount' => 1,
+                                                                         'actcount' => 0,
+                                                                         'items' => [
+                                                                                      bless( {
+                                                                                               'subrule' => 'SINGLE_QUOTED_STRING',
+                                                                                               'matchrule' => 0,
+                                                                                               'implicit' => undef,
+                                                                                               'argcode' => undef,
+                                                                                               'lookahead' => 0,
+                                                                                               'line' => 45
+                                                                                             }, 'Parse::RecDescent::Subrule' )
+                                                                                    ],
+                                                                         'line' => 45
+                                                                       }, 'Parse::RecDescent::Production' ),
+                                                                bless( {
+                                                                         'number' => '2',
+                                                                         'strcount' => 0,
+                                                                         'dircount' => 0,
+                                                                         'uncommit' => undef,
+                                                                         'error' => undef,
+                                                                         'patcount' => 0,
+                                                                         'actcount' => 0,
                                                                          'items' => [
                                                                                       bless( {
                                                                                                'subrule' => 'BARESTRING',
@@ -16095,24 +14475,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'implicit' => undef,
                                                                                                'argcode' => undef,
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 44
-                                                                                             }, 'Parse::RecDescent::Subrule' ),
-                                                                                      bless( {
-                                                                                               'hashname' => '__ACTION1__',
-                                                                                               'lookahead' => 0,
-                                                                                               'line' => 44,
-                                                                                               'code' => '{
-	 $return = $item{QUOTED_STRING}||$item{BARESTRING} ;
-	 $return||defined($return);
-}'
-                                                                                             }, 'Parse::RecDescent::Action' )
+                                                                                               'line' => 45
+                                                                                             }, 'Parse::RecDescent::Subrule' )
                                                                                     ],
-                                                                         'line' => 44
+                                                                         'line' => 45
                                                                        }, 'Parse::RecDescent::Production' )
                                                               ],
                                                    'name' => 'STRING',
                                                    'vars' => '',
-                                                   'line' => 44
+                                                   'line' => 45
                                                  }, 'Parse::RecDescent::Rule' ),
                               'bodytype' => bless( {
                                                      'impcount' => 0,
@@ -16129,7 +14500,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                            'uncommit' => undef,
                                                                            'error' => undef,
                                                                            'patcount' => 0,
-                                                                           'actcount' => 1,
+                                                                           'actcount' => 0,
                                                                            'items' => [
                                                                                         bless( {
                                                                                                  'subrule' => 'STRING',
@@ -16137,21 +14508,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 70
-                                                                                               }, 'Parse::RecDescent::Subrule' ),
-                                                                                        bless( {
-                                                                                                 'hashname' => '__ACTION1__',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 71,
-                                                                                                 'code' => '{ $return = $item{STRING} ; $return||defined($return);}'
-                                                                                               }, 'Parse::RecDescent::Action' )
+                                                                                                 'line' => 64
+                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
                                                                            'line' => undef
                                                                          }, 'Parse::RecDescent::Production' )
                                                                 ],
                                                      'name' => 'bodytype',
                                                      'vars' => '',
-                                                     'line' => 70
+                                                     'line' => 64
                                                    }, 'Parse::RecDescent::Rule' ),
                               'TEXT' => bless( {
                                                  'impcount' => 0,
@@ -16174,15 +14539,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                              'description' => '/^"TEXT"|^TEXT/i',
                                                                                              'lookahead' => 0,
                                                                                              'rdelim' => '/',
-                                                                                             'line' => 12,
+                                                                                             'line' => 29,
                                                                                              'mod' => 'i',
                                                                                              'ldelim' => '/'
                                                                                            }, 'Parse::RecDescent::Token' ),
                                                                                     bless( {
                                                                                              'hashname' => '__ACTION1__',
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 12,
-                                                                                             'code' => '{ $return = "TEXT" }'
+                                                                                             'line' => 29,
+                                                                                             'code' => '{ $return = "TEXT"   }'
                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                   ],
                                                                        'line' => undef
@@ -16190,13 +14555,12 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                             ],
                                                  'name' => 'TEXT',
                                                  'vars' => '',
-                                                 'line' => 11
+                                                 'line' => 27
                                                }, 'Parse::RecDescent::Rule' ),
                               'to' => bless( {
                                                'impcount' => 0,
                                                'calls' => [
-                                                            'NIL',
-                                                            'addressstruct'
+                                                            'ADDRESSES'
                                                           ],
                                                'changed' => 0,
                                                'opcount' => 0,
@@ -16211,63 +14575,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                      'actcount' => 0,
                                                                      'items' => [
                                                                                   bless( {
-                                                                                           'subrule' => 'NIL',
+                                                                                           'subrule' => 'ADDRESSES',
                                                                                            'matchrule' => 0,
                                                                                            'implicit' => undef,
                                                                                            'argcode' => undef,
                                                                                            'lookahead' => 0,
-                                                                                           'line' => 164
+                                                                                           'line' => 101
                                                                                          }, 'Parse::RecDescent::Subrule' )
                                                                                 ],
                                                                      'line' => undef
-                                                                   }, 'Parse::RecDescent::Production' ),
-                                                            bless( {
-                                                                     'number' => '1',
-                                                                     'strcount' => 2,
-                                                                     'dircount' => 0,
-                                                                     'uncommit' => undef,
-                                                                     'error' => undef,
-                                                                     'patcount' => 0,
-                                                                     'actcount' => 1,
-                                                                     'items' => [
-                                                                                  bless( {
-                                                                                           'pattern' => '(',
-                                                                                           'hashname' => '__STRING1__',
-                                                                                           'description' => '\'(\'',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 164
-                                                                                         }, 'Parse::RecDescent::InterpLit' ),
-                                                                                  bless( {
-                                                                                           'subrule' => 'addressstruct',
-                                                                                           'expected' => undef,
-                                                                                           'min' => 1,
-                                                                                           'argcode' => undef,
-                                                                                           'max' => 100000000,
-                                                                                           'matchrule' => 0,
-                                                                                           'repspec' => 's',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 164
-                                                                                         }, 'Parse::RecDescent::Repetition' ),
-                                                                                  bless( {
-                                                                                           'pattern' => ')',
-                                                                                           'hashname' => '__STRING2__',
-                                                                                           'description' => '\')\'',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 164
-                                                                                         }, 'Parse::RecDescent::InterpLit' ),
-                                                                                  bless( {
-                                                                                           'hashname' => '__ACTION1__',
-                                                                                           'lookahead' => 0,
-                                                                                           'line' => 165,
-                                                                                           'code' => '{ $return = $item{NIL} || $item{\'addressstruct(s)\'} }'
-                                                                                         }, 'Parse::RecDescent::Action' )
-                                                                                ],
-                                                                     'line' => 164
                                                                    }, 'Parse::RecDescent::Production' )
                                                           ],
                                                'name' => 'to',
                                                'vars' => '',
-                                               'line' => 164
+                                               'line' => 101
                                              }, 'Parse::RecDescent::Rule' ),
                               'NIL' => bless( {
                                                 'impcount' => 0,
@@ -16290,15 +14611,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                             'description' => '/^NIL/i',
                                                                                             'lookahead' => 0,
                                                                                             'rdelim' => '/',
-                                                                                            'line' => 17,
+                                                                                            'line' => 34,
                                                                                             'mod' => 'i',
                                                                                             'ldelim' => '/'
                                                                                           }, 'Parse::RecDescent::Token' ),
                                                                                    bless( {
                                                                                             'hashname' => '__ACTION1__',
                                                                                             'lookahead' => 0,
-                                                                                            'line' => 17,
-                                                                                            'code' => '{ $return = "NIL" 	}'
+                                                                                            'line' => 34,
+                                                                                            'code' => '{ $return = "NIL"    }'
                                                                                           }, 'Parse::RecDescent::Action' )
                                                                                  ],
                                                                       'line' => undef
@@ -16306,13 +14627,68 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                            ],
                                                 'name' => 'NIL',
                                                 'vars' => '',
-                                                'line' => 17
+                                                'line' => 34
                                               }, 'Parse::RecDescent::Rule' ),
+                              'KVPAIRS' => bless( {
+                                                    'impcount' => 0,
+                                                    'calls' => [
+                                                                 'kvpair'
+                                                               ],
+                                                    'changed' => 0,
+                                                    'opcount' => 0,
+                                                    'prods' => [
+                                                                 bless( {
+                                                                          'number' => '0',
+                                                                          'strcount' => 2,
+                                                                          'dircount' => 0,
+                                                                          'uncommit' => undef,
+                                                                          'error' => undef,
+                                                                          'patcount' => 0,
+                                                                          'actcount' => 1,
+                                                                          'items' => [
+                                                                                       bless( {
+                                                                                                'pattern' => '(',
+                                                                                                'hashname' => '__STRING1__',
+                                                                                                'description' => '\'(\'',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 61
+                                                                                              }, 'Parse::RecDescent::InterpLit' ),
+                                                                                       bless( {
+                                                                                                'subrule' => 'kvpair',
+                                                                                                'expected' => undef,
+                                                                                                'min' => 1,
+                                                                                                'argcode' => undef,
+                                                                                                'max' => 100000000,
+                                                                                                'matchrule' => 0,
+                                                                                                'repspec' => 's',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 61
+                                                                                              }, 'Parse::RecDescent::Repetition' ),
+                                                                                       bless( {
+                                                                                                'pattern' => ')',
+                                                                                                'hashname' => '__STRING2__',
+                                                                                                'description' => '\')\'',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 61
+                                                                                              }, 'Parse::RecDescent::InterpLit' ),
+                                                                                       bless( {
+                                                                                                'hashname' => '__ACTION1__',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 62,
+                                                                                                'code' => '{ $return = { map { (%$_) } @{$item{\'kvpair(s)\'}} } }'
+                                                                                              }, 'Parse::RecDescent::Action' )
+                                                                                     ],
+                                                                          'line' => undef
+                                                                        }, 'Parse::RecDescent::Production' )
+                                                               ],
+                                                    'name' => 'KVPAIRS',
+                                                    'vars' => '',
+                                                    'line' => 61
+                                                  }, 'Parse::RecDescent::Rule' ),
                               'from' => bless( {
                                                  'impcount' => 0,
                                                  'calls' => [
-                                                              'NIL',
-                                                              'addressstruct'
+                                                              'ADDRESSES'
                                                             ],
                                                  'changed' => 0,
                                                  'opcount' => 0,
@@ -16327,63 +14703,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                        'actcount' => 0,
                                                                        'items' => [
                                                                                     bless( {
-                                                                                             'subrule' => 'NIL',
+                                                                                             'subrule' => 'ADDRESSES',
                                                                                              'matchrule' => 0,
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 155
+                                                                                             'line' => 98
                                                                                            }, 'Parse::RecDescent::Subrule' )
                                                                                   ],
                                                                        'line' => undef
-                                                                     }, 'Parse::RecDescent::Production' ),
-                                                              bless( {
-                                                                       'number' => '1',
-                                                                       'strcount' => 2,
-                                                                       'dircount' => 0,
-                                                                       'uncommit' => undef,
-                                                                       'error' => undef,
-                                                                       'patcount' => 0,
-                                                                       'actcount' => 1,
-                                                                       'items' => [
-                                                                                    bless( {
-                                                                                             'pattern' => '(',
-                                                                                             'hashname' => '__STRING1__',
-                                                                                             'description' => '\'(\'',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 155
-                                                                                           }, 'Parse::RecDescent::InterpLit' ),
-                                                                                    bless( {
-                                                                                             'subrule' => 'addressstruct',
-                                                                                             'expected' => undef,
-                                                                                             'min' => 1,
-                                                                                             'argcode' => undef,
-                                                                                             'max' => 100000000,
-                                                                                             'matchrule' => 0,
-                                                                                             'repspec' => 's',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 155
-                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                    bless( {
-                                                                                             'pattern' => ')',
-                                                                                             'hashname' => '__STRING2__',
-                                                                                             'description' => '\')\'',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 155
-                                                                                           }, 'Parse::RecDescent::InterpLit' ),
-                                                                                    bless( {
-                                                                                             'hashname' => '__ACTION1__',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 156,
-                                                                                             'code' => '{ $return = $item{NIL} || $item{\'addressstruct(s)\'} }'
-                                                                                           }, 'Parse::RecDescent::Action' )
-                                                                                  ],
-                                                                       'line' => 155
                                                                      }, 'Parse::RecDescent::Production' )
                                                             ],
                                                  'name' => 'from',
                                                  'vars' => '',
-                                                 'line' => 155
+                                                 'line' => 98
                                                }, 'Parse::RecDescent::Rule' ),
                               'bodystructure' => bless( {
                                                           'impcount' => 0,
@@ -16407,7 +14740,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'hashname' => '__STRING1__',
                                                                                                       'description' => '\'(\'',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 267
+                                                                                                      'line' => 178
                                                                                                     }, 'Parse::RecDescent::InterpLit' ),
                                                                                              bless( {
                                                                                                       'subrule' => 'part',
@@ -16418,22 +14751,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'matchrule' => 0,
                                                                                                       'repspec' => 's',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 267
+                                                                                                      'line' => 178
                                                                                                     }, 'Parse::RecDescent::Repetition' ),
                                                                                              bless( {
                                                                                                       'pattern' => ')',
                                                                                                       'hashname' => '__STRING2__',
                                                                                                       'description' => '\')\'',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 267
+                                                                                                      'line' => 178
                                                                                                     }, 'Parse::RecDescent::InterpLit' ),
                                                                                              bless( {
                                                                                                       'hashname' => '__ACTION1__',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 268,
-                                                                                                      'code' => '{   $return = $item{\'part(s)\'} ;
-	    $return||defined($return);
-	}'
+                                                                                                      'line' => 179,
+                                                                                                      'code' => '{ $return = $item{\'part(s)\'} }'
                                                                                                     }, 'Parse::RecDescent::Action' )
                                                                                            ],
                                                                                 'line' => undef
@@ -16441,7 +14772,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                      ],
                                                           'name' => 'bodystructure',
                                                           'vars' => '',
-                                                          'line' => 267
+                                                          'line' => 178
                                                         }, 'Parse::RecDescent::Rule' ),
                               'PLAIN' => bless( {
                                                   'impcount' => 0,
@@ -16464,15 +14795,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                               'description' => '/^"PLAIN"|^PLAIN/i',
                                                                                               'lookahead' => 0,
                                                                                               'rdelim' => '/',
-                                                                                              'line' => 13,
+                                                                                              'line' => 30,
                                                                                               'mod' => 'i',
                                                                                               'ldelim' => '/'
                                                                                             }, 'Parse::RecDescent::Token' ),
                                                                                      bless( {
                                                                                               'hashname' => '__ACTION1__',
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 13,
-                                                                                              'code' => '{ $return = "PLAIN" }'
+                                                                                              'line' => 30,
+                                                                                              'code' => '{ $return = "PLAIN"  }'
                                                                                             }, 'Parse::RecDescent::Action' )
                                                                                    ],
                                                                         'line' => undef
@@ -16480,7 +14811,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                              ],
                                                   'name' => 'PLAIN',
                                                   'vars' => '',
-                                                  'line' => 13
+                                                  'line' => 30
                                                 }, 'Parse::RecDescent::Rule' ),
                               'NUMBER' => bless( {
                                                    'impcount' => 0,
@@ -16503,15 +14834,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                'description' => '/^(\\\\d+)/',
                                                                                                'lookahead' => 0,
                                                                                                'rdelim' => '/',
-                                                                                               'line' => 18,
+                                                                                               'line' => 35,
                                                                                                'mod' => '',
                                                                                                'ldelim' => '/'
                                                                                              }, 'Parse::RecDescent::Token' ),
                                                                                       bless( {
                                                                                                'hashname' => '__ACTION1__',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 18,
-                                                                                               'code' => '{ $return = $item[1]; $return||defined($return);}'
+                                                                                               'line' => 35,
+                                                                                               'code' => '{ $return = $item[1] }'
                                                                                              }, 'Parse::RecDescent::Action' )
                                                                                     ],
                                                                          'line' => undef
@@ -16519,8 +14850,64 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                               ],
                                                    'name' => 'NUMBER',
                                                    'vars' => '',
-                                                   'line' => 18
+                                                   'line' => 35
                                                  }, 'Parse::RecDescent::Rule' ),
+                              'STRINGS' => bless( {
+                                                    'impcount' => 0,
+                                                    'calls' => [
+                                                                 'STRING'
+                                                               ],
+                                                    'changed' => 0,
+                                                    'opcount' => 0,
+                                                    'prods' => [
+                                                                 bless( {
+                                                                          'number' => '0',
+                                                                          'strcount' => 2,
+                                                                          'dircount' => 0,
+                                                                          'uncommit' => undef,
+                                                                          'error' => undef,
+                                                                          'patcount' => 0,
+                                                                          'actcount' => 1,
+                                                                          'items' => [
+                                                                                       bless( {
+                                                                                                'pattern' => '(',
+                                                                                                'hashname' => '__STRING1__',
+                                                                                                'description' => '\'(\'',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 47
+                                                                                              }, 'Parse::RecDescent::InterpLit' ),
+                                                                                       bless( {
+                                                                                                'subrule' => 'STRING',
+                                                                                                'expected' => undef,
+                                                                                                'min' => 1,
+                                                                                                'argcode' => undef,
+                                                                                                'max' => 100000000,
+                                                                                                'matchrule' => 0,
+                                                                                                'repspec' => 's',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 47
+                                                                                              }, 'Parse::RecDescent::Repetition' ),
+                                                                                       bless( {
+                                                                                                'pattern' => ')',
+                                                                                                'hashname' => '__STRING2__',
+                                                                                                'description' => '\')\'',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 47
+                                                                                              }, 'Parse::RecDescent::InterpLit' ),
+                                                                                       bless( {
+                                                                                                'hashname' => '__ACTION1__',
+                                                                                                'lookahead' => 0,
+                                                                                                'line' => 47,
+                                                                                                'code' => '{ $return = $item{\'STRING(s)\'} }'
+                                                                                              }, 'Parse::RecDescent::Action' )
+                                                                                     ],
+                                                                          'line' => undef
+                                                                        }, 'Parse::RecDescent::Production' )
+                                                               ],
+                                                    'name' => 'STRINGS',
+                                                    'vars' => '',
+                                                    'line' => 47
+                                                  }, 'Parse::RecDescent::Rule' ),
                               'HTML' => bless( {
                                                  'impcount' => 0,
                                                  'calls' => [],
@@ -16542,15 +14929,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                              'description' => '/"HTML"|HTML/i',
                                                                                              'lookahead' => 0,
                                                                                              'rdelim' => '/',
-                                                                                             'line' => 14,
+                                                                                             'line' => 31,
                                                                                              'mod' => 'i',
                                                                                              'ldelim' => '/'
                                                                                            }, 'Parse::RecDescent::Token' ),
                                                                                     bless( {
                                                                                              'hashname' => '__ACTION1__',
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 14,
-                                                                                             'code' => '{ $return = "HTML" }'
+                                                                                             'line' => 31,
+                                                                                             'code' => '{ $return = "HTML"   }'
                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                   ],
                                                                        'line' => undef
@@ -16558,13 +14945,13 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                             ],
                                                  'name' => 'HTML',
                                                  'vars' => '',
-                                                 'line' => 14
+                                                 'line' => 31
                                                }, 'Parse::RecDescent::Rule' ),
                               'bodydisp' => bless( {
                                                      'impcount' => 0,
                                                      'calls' => [
                                                                   'NIL',
-                                                                  'kvpair'
+                                                                  'KVPAIRS'
                                                                 ],
                                                      'changed' => 0,
                                                      'opcount' => 0,
@@ -16584,74 +14971,42 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 82
+                                                                                                 'line' => 66
                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
                                                                            'line' => undef
                                                                          }, 'Parse::RecDescent::Production' ),
                                                                   bless( {
                                                                            'number' => '1',
-                                                                           'strcount' => 2,
+                                                                           'strcount' => 0,
                                                                            'dircount' => 0,
                                                                            'uncommit' => undef,
                                                                            'error' => undef,
                                                                            'patcount' => 0,
-                                                                           'actcount' => 1,
+                                                                           'actcount' => 0,
                                                                            'items' => [
                                                                                         bless( {
-                                                                                                 'pattern' => '(',
-                                                                                                 'hashname' => '__STRING1__',
-                                                                                                 'description' => '\'(\'',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 82
-                                                                                               }, 'Parse::RecDescent::Literal' ),
-                                                                                        bless( {
-                                                                                                 'subrule' => 'kvpair',
-                                                                                                 'expected' => undef,
-                                                                                                 'min' => 1,
-                                                                                                 'argcode' => undef,
-                                                                                                 'max' => 100000000,
+                                                                                                 'subrule' => 'KVPAIRS',
                                                                                                  'matchrule' => 0,
-                                                                                                 'repspec' => 's',
+                                                                                                 'implicit' => undef,
+                                                                                                 'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 82
-                                                                                               }, 'Parse::RecDescent::Repetition' ),
-                                                                                        bless( {
-                                                                                                 'pattern' => ')',
-                                                                                                 'hashname' => '__STRING2__',
-                                                                                                 'description' => '\')\'',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 82
-                                                                                               }, 'Parse::RecDescent::Literal' ),
-                                                                                        bless( {
-                                                                                                 'hashname' => '__ACTION1__',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 83,
-                                                                                                 'code' => '{
-                          $return = $item{NIL} || 
-                                    { map { (%$_) } @{$item{\'kvpair(s)\'}} };
-                          $return || defined($return); 
-                        }'
-                                                                                               }, 'Parse::RecDescent::Action' )
+                                                                                                 'line' => 66
+                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
-                                                                           'line' => 82
+                                                                           'line' => 66
                                                                          }, 'Parse::RecDescent::Production' )
                                                                 ],
                                                      'name' => 'bodydisp',
                                                      'vars' => '',
-                                                     'line' => 82
+                                                     'line' => 66
                                                    }, 'Parse::RecDescent::Rule' ),
                               'part' => bless( {
                                                  'impcount' => 0,
                                                  'calls' => [
-                                                              'subpart',
-                                                              'basicfields',
-                                                              'bodyparms',
-                                                              'bodydisp',
-                                                              'bodylang',
-                                                              'bodyextra',
+                                                              'multipart',
                                                               'textmessage',
-                                                              'messagerfc822message',
+                                                              'nestedmessage',
                                                               'othertypemessage'
                                                             ],
                                                  'changed' => 0,
@@ -16660,102 +15015,25 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                               bless( {
                                                                        'number' => '0',
                                                                        'strcount' => 0,
-                                                                       'dircount' => 2,
+                                                                       'dircount' => 0,
                                                                        'uncommit' => undef,
                                                                        'error' => undef,
                                                                        'patcount' => 0,
                                                                        'actcount' => 1,
                                                                        'items' => [
                                                                                     bless( {
-                                                                                             'subrule' => 'subpart',
-                                                                                             'expected' => undef,
-                                                                                             'min' => 1,
-                                                                                             'argcode' => undef,
-                                                                                             'max' => 100000000,
-                                                                                             'matchrule' => 0,
-                                                                                             'repspec' => 's',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 242
-                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                    bless( {
-                                                                                             'hashname' => '__DIRECTIVE1__',
-                                                                                             'name' => '<commit>',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 242,
-                                                                                             'code' => '$commit = 1'
-                                                                                           }, 'Parse::RecDescent::Directive' ),
-                                                                                    bless( {
-                                                                                             'subrule' => 'basicfields',
+                                                                                             'subrule' => 'multipart',
                                                                                              'matchrule' => 0,
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 242
+                                                                                             'line' => 173
                                                                                            }, 'Parse::RecDescent::Subrule' ),
-                                                                                    bless( {
-                                                                                             'subrule' => 'bodyparms',
-                                                                                             'expected' => undef,
-                                                                                             'min' => 0,
-                                                                                             'argcode' => undef,
-                                                                                             'max' => 1,
-                                                                                             'matchrule' => 0,
-                                                                                             'repspec' => '?',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 243
-                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                    bless( {
-                                                                                             'subrule' => 'bodydisp',
-                                                                                             'expected' => undef,
-                                                                                             'min' => 0,
-                                                                                             'argcode' => undef,
-                                                                                             'max' => 1,
-                                                                                             'matchrule' => 0,
-                                                                                             'repspec' => '?',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 243
-                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                    bless( {
-                                                                                             'subrule' => 'bodylang',
-                                                                                             'expected' => undef,
-                                                                                             'min' => 0,
-                                                                                             'argcode' => undef,
-                                                                                             'max' => 1,
-                                                                                             'matchrule' => 0,
-                                                                                             'repspec' => '?',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 243
-                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                    bless( {
-                                                                                             'subrule' => 'bodyextra',
-                                                                                             'expected' => undef,
-                                                                                             'min' => 0,
-                                                                                             'argcode' => undef,
-                                                                                             'max' => 1,
-                                                                                             'matchrule' => 0,
-                                                                                             'repspec' => '?',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 243
-                                                                                           }, 'Parse::RecDescent::Repetition' ),
-                                                                                    bless( {
-                                                                                             'hashname' => '__DIRECTIVE2__',
-                                                                                             'name' => '<defer:{  $subpartCount = 0 }>',
-                                                                                             'lookahead' => 0,
-                                                                                             'line' => 244,
-                                                                                             'code' => 'push @{$thisparser->{deferred}}, sub {  $subpartCount = 0 };'
-                                                                                           }, 'Parse::RecDescent::Directive' ),
                                                                                     bless( {
                                                                                              'hashname' => '__ACTION1__',
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 245,
-                                                                                             'code' => '{   $return = bless $item{basicfields},"Mail::IMAPClient::BodyStructure";
-	    $return->{bodytype} = "MULTIPART";
-	    $return->{bodystructure} = $item{\'subpart(s)\'};
-	    foreach my $b (qw/bodyparms(?) bodydisp(?) bodylang(?) bodyextra(?)/)
-	    {   my $k = $b; $k =~ s/\\(\\?\\)$//;
-	        $return->{$k} = ref($item{$b}) ? $item{$b}[0] : $item{$b};
-	    }
-	    $return;
-	}'
+                                                                                             'line' => 173,
+                                                                                             'code' => '{ $return = bless $item{multipart}, $mibs }'
                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                   ],
                                                                        'line' => undef
@@ -16775,18 +15053,16 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 254
+                                                                                             'line' => 174
                                                                                            }, 'Parse::RecDescent::Subrule' ),
                                                                                     bless( {
                                                                                              'hashname' => '__ACTION1__',
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 255,
-                                                                                             'code' => '{  $return = bless $item{textmessage}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	}'
+                                                                                             'line' => 174,
+                                                                                             'code' => '{ $return = bless $item{textmessage}, $mibs }'
                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                   ],
-                                                                       'line' => 254
+                                                                       'line' => 174
                                                                      }, 'Parse::RecDescent::Production' ),
                                                               bless( {
                                                                        'number' => '2',
@@ -16798,23 +15074,21 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                        'actcount' => 1,
                                                                        'items' => [
                                                                                     bless( {
-                                                                                             'subrule' => 'messagerfc822message',
+                                                                                             'subrule' => 'nestedmessage',
                                                                                              'matchrule' => 0,
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 258
+                                                                                             'line' => 175
                                                                                            }, 'Parse::RecDescent::Subrule' ),
                                                                                     bless( {
                                                                                              'hashname' => '__ACTION1__',
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 259,
-                                                                                             'code' => '{  $return = bless $item{messagerfc822message}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	}'
+                                                                                             'line' => 175,
+                                                                                             'code' => '{ $return = bless $item{nestedmessage}, $mibs }'
                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                   ],
-                                                                       'line' => 258
+                                                                       'line' => 175
                                                                      }, 'Parse::RecDescent::Production' ),
                                                               bless( {
                                                                        'number' => '3',
@@ -16831,24 +15105,212 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                              'implicit' => undef,
                                                                                              'argcode' => undef,
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 262
+                                                                                             'line' => 176
                                                                                            }, 'Parse::RecDescent::Subrule' ),
                                                                                     bless( {
                                                                                              'hashname' => '__ACTION1__',
                                                                                              'lookahead' => 0,
-                                                                                             'line' => 263,
-                                                                                             'code' => '{  $return = bless $item{othertypemessage}, "Mail::IMAPClient::BodyStructure";
-	   $return||defined($return);
-	}'
+                                                                                             'line' => 176,
+                                                                                             'code' => '{ $return = bless $item{othertypemessage}, $mibs }'
                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                   ],
-                                                                       'line' => 262
+                                                                       'line' => 176
                                                                      }, 'Parse::RecDescent::Production' )
                                                             ],
                                                  'name' => 'part',
                                                  'vars' => '',
-                                                 'line' => 242
+                                                 'line' => 173
                                                }, 'Parse::RecDescent::Rule' ),
+                              'nestedmessage' => bless( {
+                                                          'impcount' => 0,
+                                                          'calls' => [
+                                                                       'rfc822message',
+                                                                       'bodyparms',
+                                                                       'bodyid',
+                                                                       'bodydesc',
+                                                                       'bodyenc',
+                                                                       'bodysize',
+                                                                       'envelopestruct',
+                                                                       'bodystructure',
+                                                                       'textlines',
+                                                                       'bodyMD5',
+                                                                       'bodydisp',
+                                                                       'bodylang',
+                                                                       'bodyextra'
+                                                                     ],
+                                                          'changed' => 0,
+                                                          'opcount' => 0,
+                                                          'prods' => [
+                                                                       bless( {
+                                                                                'number' => '0',
+                                                                                'strcount' => 0,
+                                                                                'dircount' => 1,
+                                                                                'uncommit' => undef,
+                                                                                'error' => undef,
+                                                                                'patcount' => 0,
+                                                                                'actcount' => 1,
+                                                                                'items' => [
+                                                                                             bless( {
+                                                                                                      'subrule' => 'rfc822message',
+                                                                                                      'matchrule' => 0,
+                                                                                                      'implicit' => undef,
+                                                                                                      'argcode' => undef,
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 139
+                                                                                                    }, 'Parse::RecDescent::Subrule' ),
+                                                                                             bless( {
+                                                                                                      'hashname' => '__DIRECTIVE1__',
+                                                                                                      'name' => '<commit>',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 139,
+                                                                                                      'code' => '$commit = 1'
+                                                                                                    }, 'Parse::RecDescent::Directive' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodyparms',
+                                                                                                      'matchrule' => 0,
+                                                                                                      'implicit' => undef,
+                                                                                                      'argcode' => undef,
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 139
+                                                                                                    }, 'Parse::RecDescent::Subrule' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodyid',
+                                                                                                      'matchrule' => 0,
+                                                                                                      'implicit' => undef,
+                                                                                                      'argcode' => undef,
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 139
+                                                                                                    }, 'Parse::RecDescent::Subrule' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodydesc',
+                                                                                                      'matchrule' => 0,
+                                                                                                      'implicit' => undef,
+                                                                                                      'argcode' => undef,
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 139
+                                                                                                    }, 'Parse::RecDescent::Subrule' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodyenc',
+                                                                                                      'matchrule' => 0,
+                                                                                                      'implicit' => undef,
+                                                                                                      'argcode' => undef,
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 139
+                                                                                                    }, 'Parse::RecDescent::Subrule' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodysize',
+                                                                                                      'matchrule' => 0,
+                                                                                                      'implicit' => undef,
+                                                                                                      'argcode' => undef,
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 140
+                                                                                                    }, 'Parse::RecDescent::Subrule' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'envelopestruct',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 141
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodystructure',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 141
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'textlines',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 141
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodyMD5',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 142
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodydisp',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 142
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodylang',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 142
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'subrule' => 'bodyextra',
+                                                                                                      'expected' => undef,
+                                                                                                      'min' => 0,
+                                                                                                      'argcode' => undef,
+                                                                                                      'max' => 1,
+                                                                                                      'matchrule' => 0,
+                                                                                                      'repspec' => '?',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 142
+                                                                                                    }, 'Parse::RecDescent::Repetition' ),
+                                                                                             bless( {
+                                                                                                      'hashname' => '__ACTION1__',
+                                                                                                      'lookahead' => 0,
+                                                                                                      'line' => 143,
+                                                                                                      'code' => '{
+	  $return = {};
+	  $return->{$_} = $item{$_}
+	      for qw/bodyparms bodyid bodydesc bodyenc bodysize/;
+#             envelopestruct bodystructure textlines/;
+
+	  take_optional_items($return, \\%item
+, qw/envelopestruct bodystructure textlines/
+	    , qw/bodyMD5 bodydisp bodylang bodyextra/);
+
+	  merge_hash($return, $item{bodystructure}[0]);
+	  merge_hash($return, $item{basicfields});
+	  $return->{bodytype}    = "MESSAGE" ;
+	  $return->{bodysubtype} = "RFC822" ;
+	  1;
+	}'
+                                                                                                    }, 'Parse::RecDescent::Action' )
+                                                                                           ],
+                                                                                'line' => undef
+                                                                              }, 'Parse::RecDescent::Production' )
+                                                                     ],
+                                                          'name' => 'nestedmessage',
+                                                          'vars' => '',
+                                                          'line' => 139
+                                                        }, 'Parse::RecDescent::Rule' ),
                               'SINGLE_QUOTED_STRING' => bless( {
                                                                  'impcount' => 0,
                                                                  'calls' => [],
@@ -16869,7 +15331,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                              'hashname' => '__STRING1__',
                                                                                                              'description' => '\'\'\'',
                                                                                                              'lookahead' => 0,
-                                                                                                             'line' => 22
+                                                                                                             'line' => 39
                                                                                                            }, 'Parse::RecDescent::InterpLit' ),
                                                                                                     bless( {
                                                                                                              'pattern' => '(?:\\\\\'|[^\'])*',
@@ -16877,7 +15339,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                              'description' => '/(?:\\\\\\\\\'|[^\'])*/',
                                                                                                              'lookahead' => 0,
                                                                                                              'rdelim' => '/',
-                                                                                                             'line' => 22,
+                                                                                                             'line' => 39,
                                                                                                              'mod' => '',
                                                                                                              'ldelim' => '/'
                                                                                                            }, 'Parse::RecDescent::Token' ),
@@ -16886,17 +15348,13 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                              'hashname' => '__STRING2__',
                                                                                                              'description' => '\'\'\'',
                                                                                                              'lookahead' => 0,
-                                                                                                             'line' => 22
+                                                                                                             'line' => 39
                                                                                                            }, 'Parse::RecDescent::InterpLit' ),
                                                                                                     bless( {
                                                                                                              'hashname' => '__ACTION1__',
                                                                                                              'lookahead' => 0,
-                                                                                                             'line' => 22,
-                                                                                                             'code' => '{
-
-	$return = $item{__PATTERN1__} ;
-	$return||defined($return);
-}'
+                                                                                                             'line' => 39,
+                                                                                                             'code' => '{ $return = $item{__PATTERN1__} }'
                                                                                                            }, 'Parse::RecDescent::Action' )
                                                                                                   ],
                                                                                        'line' => undef
@@ -16904,13 +15362,89 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                             ],
                                                                  'name' => 'SINGLE_QUOTED_STRING',
                                                                  'vars' => '',
-                                                                 'line' => 20
+                                                                 'line' => 37
                                                                }, 'Parse::RecDescent::Rule' ),
+                              'ADDRESSES' => bless( {
+                                                      'impcount' => 0,
+                                                      'calls' => [
+                                                                   'NIL',
+                                                                   'addressstruct'
+                                                                 ],
+                                                      'changed' => 0,
+                                                      'opcount' => 0,
+                                                      'prods' => [
+                                                                   bless( {
+                                                                            'number' => '0',
+                                                                            'strcount' => 0,
+                                                                            'dircount' => 0,
+                                                                            'uncommit' => undef,
+                                                                            'error' => undef,
+                                                                            'patcount' => 0,
+                                                                            'actcount' => 0,
+                                                                            'items' => [
+                                                                                         bless( {
+                                                                                                  'subrule' => 'NIL',
+                                                                                                  'matchrule' => 0,
+                                                                                                  'implicit' => undef,
+                                                                                                  'argcode' => undef,
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 93
+                                                                                                }, 'Parse::RecDescent::Subrule' )
+                                                                                       ],
+                                                                            'line' => undef
+                                                                          }, 'Parse::RecDescent::Production' ),
+                                                                   bless( {
+                                                                            'number' => '1',
+                                                                            'strcount' => 2,
+                                                                            'dircount' => 0,
+                                                                            'uncommit' => undef,
+                                                                            'error' => undef,
+                                                                            'patcount' => 0,
+                                                                            'actcount' => 1,
+                                                                            'items' => [
+                                                                                         bless( {
+                                                                                                  'pattern' => '(',
+                                                                                                  'hashname' => '__STRING1__',
+                                                                                                  'description' => '\'(\'',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 94
+                                                                                                }, 'Parse::RecDescent::InterpLit' ),
+                                                                                         bless( {
+                                                                                                  'subrule' => 'addressstruct',
+                                                                                                  'expected' => undef,
+                                                                                                  'min' => 1,
+                                                                                                  'argcode' => undef,
+                                                                                                  'max' => 100000000,
+                                                                                                  'matchrule' => 0,
+                                                                                                  'repspec' => 's',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 94
+                                                                                                }, 'Parse::RecDescent::Repetition' ),
+                                                                                         bless( {
+                                                                                                  'pattern' => ')',
+                                                                                                  'hashname' => '__STRING2__',
+                                                                                                  'description' => '\')\'',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 94
+                                                                                                }, 'Parse::RecDescent::InterpLit' ),
+                                                                                         bless( {
+                                                                                                  'hashname' => '__ACTION1__',
+                                                                                                  'lookahead' => 0,
+                                                                                                  'line' => 94,
+                                                                                                  'code' => '{ $return = $item{\'addressstruct(s)\'} }'
+                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                       ],
+                                                                            'line' => 94
+                                                                          }, 'Parse::RecDescent::Production' )
+                                                                 ],
+                                                      'name' => 'ADDRESSES',
+                                                      'vars' => '',
+                                                      'line' => 93
+                                                    }, 'Parse::RecDescent::Rule' ),
                               'bcc' => bless( {
                                                 'impcount' => 0,
                                                 'calls' => [
-                                                             'NIL',
-                                                             'addressstruct'
+                                                             'ADDRESSES'
                                                            ],
                                                 'changed' => 0,
                                                 'opcount' => 0,
@@ -16925,63 +15459,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                       'actcount' => 0,
                                                                       'items' => [
                                                                                    bless( {
-                                                                                            'subrule' => 'NIL',
+                                                                                            'subrule' => 'ADDRESSES',
                                                                                             'matchrule' => 0,
                                                                                             'implicit' => undef,
                                                                                             'argcode' => undef,
                                                                                             'lookahead' => 0,
-                                                                                            'line' => 152
+                                                                                            'line' => 97
                                                                                           }, 'Parse::RecDescent::Subrule' )
                                                                                  ],
                                                                       'line' => undef
-                                                                    }, 'Parse::RecDescent::Production' ),
-                                                             bless( {
-                                                                      'number' => '1',
-                                                                      'strcount' => 2,
-                                                                      'dircount' => 0,
-                                                                      'uncommit' => undef,
-                                                                      'error' => undef,
-                                                                      'patcount' => 0,
-                                                                      'actcount' => 1,
-                                                                      'items' => [
-                                                                                   bless( {
-                                                                                            'pattern' => '(',
-                                                                                            'hashname' => '__STRING1__',
-                                                                                            'description' => '\'(\'',
-                                                                                            'lookahead' => 0,
-                                                                                            'line' => 152
-                                                                                          }, 'Parse::RecDescent::InterpLit' ),
-                                                                                   bless( {
-                                                                                            'subrule' => 'addressstruct',
-                                                                                            'expected' => undef,
-                                                                                            'min' => 1,
-                                                                                            'argcode' => undef,
-                                                                                            'max' => 100000000,
-                                                                                            'matchrule' => 0,
-                                                                                            'repspec' => 's',
-                                                                                            'lookahead' => 0,
-                                                                                            'line' => 152
-                                                                                          }, 'Parse::RecDescent::Repetition' ),
-                                                                                   bless( {
-                                                                                            'pattern' => ')',
-                                                                                            'hashname' => '__STRING2__',
-                                                                                            'description' => '\')\'',
-                                                                                            'lookahead' => 0,
-                                                                                            'line' => 152
-                                                                                          }, 'Parse::RecDescent::InterpLit' ),
-                                                                                   bless( {
-                                                                                            'hashname' => '__ACTION1__',
-                                                                                            'lookahead' => 0,
-                                                                                            'line' => 153,
-                                                                                            'code' => '{ $return = $item{NIL} || $item{\'addressstruct(s)\'} }'
-                                                                                          }, 'Parse::RecDescent::Action' )
-                                                                                 ],
-                                                                      'line' => 152
                                                                     }, 'Parse::RecDescent::Production' )
                                                            ],
                                                 'name' => 'bcc',
                                                 'vars' => '',
-                                                'line' => 152
+                                                'line' => 97
                                               }, 'Parse::RecDescent::Rule' ),
                               'rfc822message' => bless( {
                                                           'impcount' => 0,
@@ -17007,7 +15498,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'implicit' => undef,
                                                                                                       'argcode' => undef,
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 59
+                                                                                                      'line' => 51
                                                                                                     }, 'Parse::RecDescent::Subrule' ),
                                                                                              bless( {
                                                                                                       'subrule' => 'RFC822',
@@ -17015,12 +15506,12 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'implicit' => undef,
                                                                                                       'argcode' => undef,
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 59
+                                                                                                      'line' => 51
                                                                                                     }, 'Parse::RecDescent::Subrule' ),
                                                                                              bless( {
                                                                                                       'hashname' => '__ACTION1__',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 59,
+                                                                                                      'line' => 51,
                                                                                                       'code' => '{ $return = "MESSAGE RFC822" }'
                                                                                                     }, 'Parse::RecDescent::Action' )
                                                                                            ],
@@ -17029,72 +15520,8 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                      ],
                                                           'name' => 'rfc822message',
                                                           'vars' => '',
-                                                          'line' => 59
+                                                          'line' => 51
                                                         }, 'Parse::RecDescent::Rule' ),
-                              'OLDSTRING' => bless( {
-                                                      'impcount' => 0,
-                                                      'calls' => [],
-                                                      'changed' => 0,
-                                                      'opcount' => 0,
-                                                      'prods' => [
-                                                                   bless( {
-                                                                            'number' => '0',
-                                                                            'strcount' => 0,
-                                                                            'dircount' => 0,
-                                                                            'uncommit' => undef,
-                                                                            'error' => undef,
-                                                                            'patcount' => 1,
-                                                                            'actcount' => 0,
-                                                                            'items' => [
-                                                                                         bless( {
-                                                                                                  'pattern' => '^"((?:[^"\\\\]|\\\\.)*)"',
-                                                                                                  'hashname' => '__PATTERN1__',
-                                                                                                  'description' => '/^"((?:[^"\\\\\\\\]|\\\\\\\\.)*)"/',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'rdelim' => '/',
-                                                                                                  'line' => 49,
-                                                                                                  'mod' => '',
-                                                                                                  'ldelim' => '/'
-                                                                                                }, 'Parse::RecDescent::Token' )
-                                                                                       ],
-                                                                            'line' => undef
-                                                                          }, 'Parse::RecDescent::Production' ),
-                                                                   bless( {
-                                                                            'number' => '1',
-                                                                            'strcount' => 0,
-                                                                            'dircount' => 0,
-                                                                            'uncommit' => undef,
-                                                                            'error' => undef,
-                                                                            'patcount' => 1,
-                                                                            'actcount' => 1,
-                                                                            'items' => [
-                                                                                         bless( {
-                                                                                                  'pattern' => '^([^ \\(\\)]+)',
-                                                                                                  'hashname' => '__PATTERN1__',
-                                                                                                  'description' => '/^([^ \\\\(\\\\)]+)/',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'rdelim' => '/',
-                                                                                                  'line' => 49,
-                                                                                                  'mod' => '',
-                                                                                                  'ldelim' => '/'
-                                                                                                }, 'Parse::RecDescent::Token' ),
-                                                                                         bless( {
-                                                                                                  'hashname' => '__ACTION1__',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 50,
-                                                                                                  'code' => '{       $item{__PATTERN1__} =~ s/^"(.*)"$/$1/;
-                                $return = $item{__PATTERN1__} || $item{__PATTERN2__} ;
-                                $return||defined($return);
-                        }'
-                                                                                                }, 'Parse::RecDescent::Action' )
-                                                                                       ],
-                                                                            'line' => 49
-                                                                          }, 'Parse::RecDescent::Production' )
-                                                                 ],
-                                                      'name' => 'OLDSTRING',
-                                                      'vars' => '',
-                                                      'line' => 49
-                                                    }, 'Parse::RecDescent::Rule' ),
                               'addressstruct' => bless( {
                                                           'impcount' => 0,
                                                           'calls' => [
@@ -17120,7 +15547,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'hashname' => '__STRING1__',
                                                                                                       'description' => '\'(\'',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 126
+                                                                                                      'line' => 80
                                                                                                     }, 'Parse::RecDescent::InterpLit' ),
                                                                                              bless( {
                                                                                                       'subrule' => 'personalname',
@@ -17128,7 +15555,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'implicit' => undef,
                                                                                                       'argcode' => undef,
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 126
+                                                                                                      'line' => 80
                                                                                                     }, 'Parse::RecDescent::Subrule' ),
                                                                                              bless( {
                                                                                                       'subrule' => 'sourceroute',
@@ -17136,7 +15563,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'implicit' => undef,
                                                                                                       'argcode' => undef,
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 126
+                                                                                                      'line' => 80
                                                                                                     }, 'Parse::RecDescent::Subrule' ),
                                                                                              bless( {
                                                                                                       'subrule' => 'mailboxname',
@@ -17144,7 +15571,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'implicit' => undef,
                                                                                                       'argcode' => undef,
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 126
+                                                                                                      'line' => 80
                                                                                                     }, 'Parse::RecDescent::Subrule' ),
                                                                                              bless( {
                                                                                                       'subrule' => 'hostname',
@@ -17152,26 +15579,25 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                       'implicit' => undef,
                                                                                                       'argcode' => undef,
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 126
+                                                                                                      'line' => 80
                                                                                                     }, 'Parse::RecDescent::Subrule' ),
                                                                                              bless( {
                                                                                                       'pattern' => ')',
                                                                                                       'hashname' => '__STRING2__',
                                                                                                       'description' => '\')\'',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 126
+                                                                                                      'line' => 80
                                                                                                     }, 'Parse::RecDescent::InterpLit' ),
                                                                                              bless( {
                                                                                                       'hashname' => '__ACTION1__',
                                                                                                       'lookahead' => 0,
-                                                                                                      'line' => 127,
-                                                                                                      'code' => '{ bless {
-			personalname => $item{personalname} ,	
-			sourceroute  => $item{sourceroute} ,	
-			mailboxname  => $item{mailboxname} ,	
-			hostname     => $item{hostname} ,	
-		  }, \'Mail::IMAPClient::BodyStructure::Address\';
-		}'
+                                                                                                      'line' => 81,
+                                                                                                      'code' => '{ bless { personalname => $item{personalname}
+		, sourceroute  => $item{sourceroute}
+		, mailboxname  => $item{mailboxname}
+		, hostname     => $item{hostname}
+	        }, \'Mail::IMAPClient::BodyStructure::Address\';
+	}'
                                                                                                     }, 'Parse::RecDescent::Action' )
                                                                                            ],
                                                                                 'line' => undef
@@ -17179,7 +15605,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                      ],
                                                           'name' => 'addressstruct',
                                                           'vars' => '',
-                                                          'line' => 126
+                                                          'line' => 80
                                                         }, 'Parse::RecDescent::Rule' ),
                               'sourceroute' => bless( {
                                                         'impcount' => 0,
@@ -17205,7 +15631,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 117
+                                                                                                    'line' => 76
                                                                                                   }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
                                                                               'line' => undef
@@ -17217,7 +15643,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                               'uncommit' => undef,
                                                                               'error' => undef,
                                                                               'patcount' => 0,
-                                                                              'actcount' => 1,
+                                                                              'actcount' => 0,
                                                                               'items' => [
                                                                                            bless( {
                                                                                                     'subrule' => 'STRING',
@@ -17225,21 +15651,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 117
-                                                                                                  }, 'Parse::RecDescent::Subrule' ),
-                                                                                           bless( {
-                                                                                                    'hashname' => '__ACTION1__',
-                                                                                                    'lookahead' => 0,
-                                                                                                    'line' => 118,
-                                                                                                    'code' => '{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}'
-                                                                                                  }, 'Parse::RecDescent::Action' )
+                                                                                                    'line' => 76
+                                                                                                  }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
-                                                                              'line' => 117
+                                                                              'line' => 76
                                                                             }, 'Parse::RecDescent::Production' )
                                                                    ],
                                                         'name' => 'sourceroute',
                                                         'vars' => '',
-                                                        'line' => 117
+                                                        'line' => 76
                                                       }, 'Parse::RecDescent::Rule' ),
                               'subpart' => bless( {
                                                     'impcount' => 0,
@@ -17263,7 +15683,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'hashname' => '__STRING1__',
                                                                                                 'description' => '\'(\'',
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 236
+                                                                                                'line' => 171
                                                                                               }, 'Parse::RecDescent::InterpLit' ),
                                                                                        bless( {
                                                                                                 'subrule' => 'part',
@@ -17271,28 +15691,26 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 236
+                                                                                                'line' => 171
                                                                                               }, 'Parse::RecDescent::Subrule' ),
                                                                                        bless( {
                                                                                                 'pattern' => ')',
                                                                                                 'hashname' => '__STRING2__',
                                                                                                 'description' => '\')\'',
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 236
+                                                                                                'line' => 171
                                                                                               }, 'Parse::RecDescent::InterpLit' ),
                                                                                        bless( {
                                                                                                 'hashname' => '__ACTION1__',
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 237,
-                                                                                                'code' => '{   $return = $item{part} ; 
-	    $return||defined($return);
-	}'
+                                                                                                'line' => 171,
+                                                                                                'code' => '{$return = $item{part}}'
                                                                                               }, 'Parse::RecDescent::Action' ),
                                                                                        bless( {
                                                                                                 'hashname' => '__DIRECTIVE1__',
                                                                                                 'name' => '<defer:{  ++$subpartCount; }>',
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 239,
+                                                                                                'line' => 171,
                                                                                                 'code' => 'push @{$thisparser->{deferred}}, sub {  ++$subpartCount; };'
                                                                                               }, 'Parse::RecDescent::Directive' )
                                                                                      ],
@@ -17301,7 +15719,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                ],
                                                     'name' => 'subpart',
                                                     'vars' => '',
-                                                    'line' => 236
+                                                    'line' => 171
                                                   }, 'Parse::RecDescent::Rule' ),
                               'textlines' => bless( {
                                                       'impcount' => 0,
@@ -17327,7 +15745,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 58
+                                                                                                  'line' => 49
                                                                                                 }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
                                                                             'line' => undef
@@ -17339,7 +15757,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                             'uncommit' => undef,
                                                                             'error' => undef,
                                                                             'patcount' => 0,
-                                                                            'actcount' => 1,
+                                                                            'actcount' => 0,
                                                                             'items' => [
                                                                                          bless( {
                                                                                                   'subrule' => 'NUMBER',
@@ -17347,21 +15765,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                   'implicit' => undef,
                                                                                                   'argcode' => undef,
                                                                                                   'lookahead' => 0,
-                                                                                                  'line' => 58
-                                                                                                }, 'Parse::RecDescent::Subrule' ),
-                                                                                         bless( {
-                                                                                                  'hashname' => '__ACTION1__',
-                                                                                                  'lookahead' => 0,
-                                                                                                  'line' => 58,
-                                                                                                  'code' => '{ $return = $item[1] || $item[2]; $return||defined($return); }'
-                                                                                                }, 'Parse::RecDescent::Action' )
+                                                                                                  'line' => 49
+                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                        ],
-                                                                            'line' => 58
+                                                                            'line' => 49
                                                                           }, 'Parse::RecDescent::Production' )
                                                                  ],
                                                       'name' => 'textlines',
                                                       'vars' => '',
-                                                      'line' => 56
+                                                      'line' => 49
                                                     }, 'Parse::RecDescent::Rule' ),
                               'BARESTRING' => bless( {
                                                        'impcount' => 0,
@@ -17384,7 +15796,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                    'description' => '/^[)(\'"]/',
                                                                                                    'lookahead' => -1,
                                                                                                    'rdelim' => '/',
-                                                                                                   'line' => 40,
+                                                                                                   'line' => 42,
                                                                                                    'mod' => '',
                                                                                                    'ldelim' => '/'
                                                                                                  }, 'Parse::RecDescent::Token' ),
@@ -17394,17 +15806,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                    'description' => '/^(?!\\\\(|\\\\))(?:\\\\\\\\ |\\\\S)+/',
                                                                                                    'lookahead' => 0,
                                                                                                    'rdelim' => '/',
-                                                                                                   'line' => 40,
+                                                                                                   'line' => 42,
                                                                                                    'mod' => '',
                                                                                                    'ldelim' => '/'
                                                                                                  }, 'Parse::RecDescent::Token' ),
                                                                                           bless( {
                                                                                                    'hashname' => '__ACTION1__',
                                                                                                    'lookahead' => 0,
-                                                                                                   'line' => 40,
-                                                                                                   'code' => '{ 
-	$return = $item{__PATTERN1__} ; $return||defined($return);
-}'
+                                                                                                   'line' => 43,
+                                                                                                   'code' => '{ $return = $item{__PATTERN1__} }'
                                                                                                  }, 'Parse::RecDescent::Action' )
                                                                                         ],
                                                                              'line' => undef
@@ -17412,13 +15822,14 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                   ],
                                                        'name' => 'BARESTRING',
                                                        'vars' => '',
-                                                       'line' => 40
+                                                       'line' => 42
                                                      }, 'Parse::RecDescent::Rule' ),
                               'bodylang' => bless( {
                                                      'impcount' => 0,
                                                      'calls' => [
                                                                   'NIL',
-                                                                  'STRING'
+                                                                  'STRING',
+                                                                  'STRINGS'
                                                                 ],
                                                      'changed' => 0,
                                                      'opcount' => 0,
@@ -17438,7 +15849,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 108
+                                                                                                 'line' => 72
                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
                                                                            'line' => undef
@@ -17458,58 +15869,35 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                  'implicit' => undef,
                                                                                                  'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 108
+                                                                                                 'line' => 72
                                                                                                }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
-                                                                           'line' => 108
+                                                                           'line' => 72
                                                                          }, 'Parse::RecDescent::Production' ),
                                                                   bless( {
                                                                            'number' => '2',
-                                                                           'strcount' => 2,
+                                                                           'strcount' => 0,
                                                                            'dircount' => 0,
                                                                            'uncommit' => undef,
                                                                            'error' => undef,
                                                                            'patcount' => 0,
-                                                                           'actcount' => 1,
+                                                                           'actcount' => 0,
                                                                            'items' => [
                                                                                         bless( {
-                                                                                                 'pattern' => '(',
-                                                                                                 'hashname' => '__STRING1__',
-                                                                                                 'description' => '\'(\'',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 108
-                                                                                               }, 'Parse::RecDescent::InterpLit' ),
-                                                                                        bless( {
-                                                                                                 'subrule' => 'STRING',
-                                                                                                 'expected' => undef,
-                                                                                                 'min' => 1,
-                                                                                                 'argcode' => undef,
-                                                                                                 'max' => 100000000,
+                                                                                                 'subrule' => 'STRINGS',
                                                                                                  'matchrule' => 0,
-                                                                                                 'repspec' => 's',
+                                                                                                 'implicit' => undef,
+                                                                                                 'argcode' => undef,
                                                                                                  'lookahead' => 0,
-                                                                                                 'line' => 108
-                                                                                               }, 'Parse::RecDescent::Repetition' ),
-                                                                                        bless( {
-                                                                                                 'pattern' => ')',
-                                                                                                 'hashname' => '__STRING2__',
-                                                                                                 'description' => '\')\'',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 108
-                                                                                               }, 'Parse::RecDescent::InterpLit' ),
-                                                                                        bless( {
-                                                                                                 'hashname' => '__ACTION1__',
-                                                                                                 'lookahead' => 0,
-                                                                                                 'line' => 109,
-                                                                                                 'code' => '{ $return = $item{NIL} || $item{\'STRING(s)\'}; $return||defined($return);}'
-                                                                                               }, 'Parse::RecDescent::Action' )
+                                                                                                 'line' => 72
+                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                       ],
-                                                                           'line' => 108
+                                                                           'line' => 72
                                                                          }, 'Parse::RecDescent::Production' )
                                                                 ],
                                                      'name' => 'bodylang',
                                                      'vars' => '',
-                                                     'line' => 108
+                                                     'line' => 72
                                                    }, 'Parse::RecDescent::Rule' ),
                               'envelopestruct' => bless( {
                                                            'impcount' => 0,
@@ -17542,7 +15930,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'hashname' => '__STRING1__',
                                                                                                        'description' => '\'(\'',
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::InterpLit' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'date',
@@ -17550,7 +15938,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'subject',
@@ -17558,7 +15946,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'from',
@@ -17566,7 +15954,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'sender',
@@ -17574,7 +15962,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'replyto',
@@ -17582,7 +15970,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'to',
@@ -17590,7 +15978,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'cc',
@@ -17598,7 +15986,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 103
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'bcc',
@@ -17606,7 +15994,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 104
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'inreplyto',
@@ -17614,7 +16002,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 104
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'subrule' => 'messageid',
@@ -17622,24 +16010,24 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                        'implicit' => undef,
                                                                                                        'argcode' => undef,
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 104
                                                                                                      }, 'Parse::RecDescent::Subrule' ),
                                                                                               bless( {
                                                                                                        'pattern' => ')',
                                                                                                        'hashname' => '__STRING2__',
                                                                                                        'description' => '\')\'',
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 167
+                                                                                                       'line' => 104
                                                                                                      }, 'Parse::RecDescent::InterpLit' ),
                                                                                               bless( {
                                                                                                        'hashname' => '__ACTION1__',
                                                                                                        'lookahead' => 0,
-                                                                                                       'line' => 168,
-                                                                                                       'code' => '{ $return = bless {}, "Mail::IMAPClient::BodyStructure::Envelope"; 
+                                                                                                       'line' => 105,
+                                                                                                       'code' => '{ $return = bless {}, "Mail::IMAPClient::BodyStructure::Envelope";
 	  $return->{$_} = $item{$_}
 	     for qw/date subject from sender replyto to cc/
-               , qw/bcc inreplyto messageid/ ;
-	  $return;
+	       , qw/bcc inreplyto messageid/;
+	  1;
 	}'
                                                                                                      }, 'Parse::RecDescent::Action' )
                                                                                             ],
@@ -17648,13 +16036,12 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                       ],
                                                            'name' => 'envelopestruct',
                                                            'vars' => '',
-                                                           'line' => 167
+                                                           'line' => 103
                                                          }, 'Parse::RecDescent::Rule' ),
                               'replyto' => bless( {
                                                     'impcount' => 0,
                                                     'calls' => [
-                                                                 'NIL',
-                                                                 'addressstruct'
+                                                                 'ADDRESSES'
                                                                ],
                                                     'changed' => 0,
                                                     'opcount' => 0,
@@ -17669,63 +16056,20 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                           'actcount' => 0,
                                                                           'items' => [
                                                                                        bless( {
-                                                                                                'subrule' => 'NIL',
+                                                                                                'subrule' => 'ADDRESSES',
                                                                                                 'matchrule' => 0,
                                                                                                 'implicit' => undef,
                                                                                                 'argcode' => undef,
                                                                                                 'lookahead' => 0,
-                                                                                                'line' => 158
+                                                                                                'line' => 99
                                                                                               }, 'Parse::RecDescent::Subrule' )
                                                                                      ],
                                                                           'line' => undef
-                                                                        }, 'Parse::RecDescent::Production' ),
-                                                                 bless( {
-                                                                          'number' => '1',
-                                                                          'strcount' => 2,
-                                                                          'dircount' => 0,
-                                                                          'uncommit' => undef,
-                                                                          'error' => undef,
-                                                                          'patcount' => 0,
-                                                                          'actcount' => 1,
-                                                                          'items' => [
-                                                                                       bless( {
-                                                                                                'pattern' => '(',
-                                                                                                'hashname' => '__STRING1__',
-                                                                                                'description' => '\'(\'',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 158
-                                                                                              }, 'Parse::RecDescent::InterpLit' ),
-                                                                                       bless( {
-                                                                                                'subrule' => 'addressstruct',
-                                                                                                'expected' => undef,
-                                                                                                'min' => 1,
-                                                                                                'argcode' => undef,
-                                                                                                'max' => 100000000,
-                                                                                                'matchrule' => 0,
-                                                                                                'repspec' => 's',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 158
-                                                                                              }, 'Parse::RecDescent::Repetition' ),
-                                                                                       bless( {
-                                                                                                'pattern' => ')',
-                                                                                                'hashname' => '__STRING2__',
-                                                                                                'description' => '\')\'',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 158
-                                                                                              }, 'Parse::RecDescent::InterpLit' ),
-                                                                                       bless( {
-                                                                                                'hashname' => '__ACTION1__',
-                                                                                                'lookahead' => 0,
-                                                                                                'line' => 159,
-                                                                                                'code' => '{ $return = $item{NIL} || $item{\'addressstruct(s)\'} }'
-                                                                                              }, 'Parse::RecDescent::Action' )
-                                                                                     ],
-                                                                          'line' => 158
                                                                         }, 'Parse::RecDescent::Production' )
                                                                ],
                                                     'name' => 'replyto',
                                                     'vars' => '',
-                                                    'line' => 158
+                                                    'line' => 99
                                                   }, 'Parse::RecDescent::Rule' ),
                               'mailboxname' => bless( {
                                                         'impcount' => 0,
@@ -17751,7 +16095,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 120
+                                                                                                    'line' => 77
                                                                                                   }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
                                                                               'line' => undef
@@ -17763,7 +16107,7 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                               'uncommit' => undef,
                                                                               'error' => undef,
                                                                               'patcount' => 0,
-                                                                              'actcount' => 1,
+                                                                              'actcount' => 0,
                                                                               'items' => [
                                                                                            bless( {
                                                                                                     'subrule' => 'STRING',
@@ -17771,21 +16115,15 @@ package Mail::IMAPClient::BodyStructure::Parse; sub new { my $self = bless( {
                                                                                                     'implicit' => undef,
                                                                                                     'argcode' => undef,
                                                                                                     'lookahead' => 0,
-                                                                                                    'line' => 120
-                                                                                                  }, 'Parse::RecDescent::Subrule' ),
-                                                                                           bless( {
-                                                                                                    'hashname' => '__ACTION1__',
-                                                                                                    'lookahead' => 0,
-                                                                                                    'line' => 121,
-                                                                                                    'code' => '{ $return = $item{NIL} || $item{STRING}; $return||defined($return);}'
-                                                                                                  }, 'Parse::RecDescent::Action' )
+                                                                                                    'line' => 77
+                                                                                                  }, 'Parse::RecDescent::Subrule' )
                                                                                          ],
-                                                                              'line' => 120
+                                                                              'line' => 77
                                                                             }, 'Parse::RecDescent::Production' )
                                                                    ],
                                                         'name' => 'mailboxname',
                                                         'vars' => '',
-                                                        'line' => 120
+                                                        'line' => 77
                                                       }, 'Parse::RecDescent::Rule' )
                             }
                }, 'Parse::RecDescent' );
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.pod b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.pod
similarity index 100%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/BodyStructure/Parse.pod
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/BodyStructure/Parse.pod
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/MessageSet.pm b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/MessageSet.pm
similarity index 97%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/MessageSet.pm
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/MessageSet.pm
index 84cf231..28405ad 100644
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/MessageSet.pm
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/MessageSet.pm
@@ -5,7 +5,7 @@ package Mail::IMAPClient::MessageSet;
 
 =head1 NAME
 
-Mail::IMAPClient::MessageSet -- ranges of message sequence nummers
+Mail::IMAPClient::MessageSet - ranges of message sequence nummers
 
 =cut
 
@@ -26,6 +26,7 @@ sub new
 sub str { overload::StrVal( ${$_[0]} ) }
 
 sub _unfold_range($)
+# {   my $x = shift; return if $x =~ m/[^0-9,:]$/; $x =~ s/\:/../g; eval $x; }
 {   map { /(\d+)\s*\:\s*(\d+)/ ? ($1..$2) : $_ }
         split /\,/, shift;
 }
@@ -33,7 +34,7 @@ sub _unfold_range($)
 sub rem
 {   my $self   = shift;
     my %delete = map { ($_ => 1) } map { _unfold_range $_ } @_;
-    $$self     = $self->range(map {$delete{$_} ? () : $_ } $self->unfold);
+    $$self     = $self->range(grep {not $delete{$_}} $self->unfold);
     $self;
 }
 
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.grammar b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.grammar
similarity index 100%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.grammar
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.grammar
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.pm b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.pm
similarity index 98%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.pm
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.pm
index 326ddde..7d1e1b2 100644
--- a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.pm
+++ b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.pm
@@ -820,7 +820,7 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                                'hashname' => '__STRING1__',
                                                                                                'description' => '\'(\'',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 274
+                                                                                               'line' => 177
                                                                                              }, 'Parse::RecDescent::InterpLit' ),
                                                                                       bless( {
                                                                                                'subrule' => 'threadmember',
@@ -831,19 +831,19 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                                'matchrule' => 0,
                                                                                                'repspec' => 's',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 274
+                                                                                               'line' => 177
                                                                                              }, 'Parse::RecDescent::Repetition' ),
                                                                                       bless( {
                                                                                                'pattern' => ')',
                                                                                                'hashname' => '__STRING2__',
                                                                                                'description' => '\')\'',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 274
+                                                                                               'line' => 177
                                                                                              }, 'Parse::RecDescent::InterpLit' ),
                                                                                       bless( {
                                                                                                'hashname' => '__ACTION1__',
                                                                                                'lookahead' => 0,
-                                                                                               'line' => 275,
+                                                                                               'line' => 178,
                                                                                                'code' => '{
 		$return = $item{\'threadmember(s)\'}||undef;	
 	}'
@@ -854,7 +854,7 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                               ],
                                                    'name' => 'thread',
                                                    'vars' => '',
-                                                   'line' => 274
+                                                   'line' => 177
                                                  }, 'Parse::RecDescent::Rule' ),
                               'NUMBER' => bless( {
                                                    'impcount' => 0,
@@ -877,7 +877,7 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                                'description' => '/\\\\d+/',
                                                                                                'lookahead' => 0,
                                                                                                'rdelim' => '/',
-                                                                                               'line' => 267,
+                                                                                               'line' => 170,
                                                                                                'mod' => '',
                                                                                                'ldelim' => '/'
                                                                                              }, 'Parse::RecDescent::Token' )
@@ -887,7 +887,7 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                               ],
                                                    'name' => 'NUMBER',
                                                    'vars' => '',
-                                                   'line' => 265
+                                                   'line' => 168
                                                  }, 'Parse::RecDescent::Rule' ),
                               'start' => bless( {
                                                   'impcount' => 0,
@@ -912,7 +912,7 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                               'description' => '/^\\\\* THREAD /i',
                                                                                               'lookahead' => 0,
                                                                                               'rdelim' => '/',
-                                                                                              'line' => 280,
+                                                                                              'line' => 183,
                                                                                               'mod' => 'i',
                                                                                               'ldelim' => '/'
                                                                                             }, 'Parse::RecDescent::Token' ),
@@ -925,12 +925,12 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                               'matchrule' => 0,
                                                                                               'repspec' => 's?',
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 280
+                                                                                              'line' => 183
                                                                                             }, 'Parse::RecDescent::Repetition' ),
                                                                                      bless( {
                                                                                               'hashname' => '__ACTION1__',
                                                                                               'lookahead' => 0,
-                                                                                              'line' => 280,
+                                                                                              'line' => 183,
                                                                                               'code' => '{
 	$return=$item{\'thread(s?)\'}||undef;
 }'
@@ -941,7 +941,7 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                              ],
                                                   'name' => 'start',
                                                   'vars' => '',
-                                                  'line' => 279
+                                                  'line' => 182
                                                 }, 'Parse::RecDescent::Rule' ),
                               'threadmember' => bless( {
                                                          'impcount' => 0,
@@ -967,12 +967,12 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                                      'implicit' => undef,
                                                                                                      'argcode' => undef,
                                                                                                      'lookahead' => 0,
-                                                                                                     'line' => 271
+                                                                                                     'line' => 174
                                                                                                    }, 'Parse::RecDescent::Subrule' ),
                                                                                             bless( {
                                                                                                      'hashname' => '__ACTION1__',
                                                                                                      'lookahead' => 0,
-                                                                                                     'line' => 271,
+                                                                                                     'line' => 174,
                                                                                                      'code' => '{ $return = $item{NUMBER} ; }'
                                                                                                    }, 'Parse::RecDescent::Action' )
                                                                                           ],
@@ -993,21 +993,21 @@ package Mail::IMAPClient::Thread; sub new { my $self = bless( {
                                                                                                      'implicit' => undef,
                                                                                                      'argcode' => undef,
                                                                                                      'lookahead' => 0,
-                                                                                                     'line' => 272
+                                                                                                     'line' => 175
                                                                                                    }, 'Parse::RecDescent::Subrule' ),
                                                                                             bless( {
                                                                                                      'hashname' => '__ACTION1__',
                                                                                                      'lookahead' => 0,
-                                                                                                     'line' => 272,
+                                                                                                     'line' => 175,
                                                                                                      'code' => '{ $return = $item{thread} ; }'
                                                                                                    }, 'Parse::RecDescent::Action' )
                                                                                           ],
-                                                                               'line' => 271
+                                                                               'line' => 174
                                                                              }, 'Parse::RecDescent::Production' )
                                                                     ],
                                                          'name' => 'threadmember',
                                                          'vars' => '',
-                                                         'line' => 269
+                                                         'line' => 172
                                                        }, 'Parse::RecDescent::Rule' )
                             }
                }, 'Parse::RecDescent' );
diff --git a/Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.pod b/Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.pod
similarity index 100%
rename from Mail-IMAPClient-3.00/lib/Mail/IMAPClient/Thread.pod
rename to Mail-IMAPClient-3.05/lib/Mail/IMAPClient/Thread.pod
diff --git a/Mail-IMAPClient-3.00/prepare_dist b/Mail-IMAPClient-3.05/prepare_dist
similarity index 100%
rename from Mail-IMAPClient-3.00/prepare_dist
rename to Mail-IMAPClient-3.05/prepare_dist
diff --git a/Mail-IMAPClient-3.00/sample.perldb b/Mail-IMAPClient-3.05/sample.perldb
similarity index 100%
rename from Mail-IMAPClient-3.00/sample.perldb
rename to Mail-IMAPClient-3.05/sample.perldb
diff --git a/Mail-IMAPClient-3.00/t/basic.t b/Mail-IMAPClient-3.05/t/basic.t
similarity index 100%
rename from Mail-IMAPClient-3.00/t/basic.t
rename to Mail-IMAPClient-3.05/t/basic.t
diff --git a/Mail-IMAPClient-3.00/t/bodystructure.t b/Mail-IMAPClient-3.05/t/bodystructure.t
similarity index 57%
rename from Mail-IMAPClient-3.00/t/bodystructure.t
rename to Mail-IMAPClient-3.05/t/bodystructure.t
index 1d8f1dd..9a6ae5a 100755
--- a/Mail-IMAPClient-3.00/t/bodystructure.t
+++ b/Mail-IMAPClient-3.05/t/bodystructure.t
@@ -2,8 +2,12 @@
 
 use warnings;
 use strict;
+use lib 'lib';
 
-use Test::More tests => 8;
+use Test::More tests => 10;
+
+use Data::Dumper;
+$Data::Dumper::Indent=1;
 
 use_ok('Mail::IMAPClient::BodyStructure');
 
@@ -16,8 +20,9 @@ ok(defined $bsobj, 'parsed first');
 is($bsobj->bodytype, 'TEXT', 'bodytype');
 is($bsobj->bodysubtype, 'PLAIN', 'bodysubtype');
 
+
 my $bs2 = <<'END_OF_BS2';
-(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 2 1 NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 3930 ("Tue, 16 Jul 2002 15:29:17 -0400" "Re: [Fwd: Here is the the list of uids]" (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("David J Kavid" NIL "david.kavid" "generic.com")) NIL NIL "<72f9a217.a21772f9@generic.com>") (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 369 11 NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 2599 ("Tue, 9 Jul 2002 13:42:04 -0400" "Here is the the list of uids" (("Nicholas Kringle" NIL "nicholas.kringle" "generic.com")) (("Nicholas Kringle" NIL "nicholas.kringle" "generic.com")) (("Nicholas Kringle" NIL "nicholas.kringle" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Richard W Continued" NIL "richard.continued" "generic.com")) NIL NIL "<015401c2276f$f09b7c10$59cab08c@one.two.generic.com>") ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 256 10 NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 791 22 NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "----=_NextPart_001_0151_01C2274E.6969D0F0") NIL NIL) "MIXED" ("BOUNDARY" "----=_NextPart_000_0150_01C2274E.6969D0F0") NIL NIL) 75 NIL NIL NIL) "MIXED" ("BOUNDARY" "--1f34eac2082b02") NIL ("EN")) 118 NIL NIL NIL) "MIXED" ("BOUNDARY" "------------F600BD8FDDD648ABA72A09E0") NIL NIL))
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" 'us-ascii') NIL NIL "7BIT" 2 1 NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 3930 ("Tue, 16 Jul 2002 15:29:17 -0400" "Re: [Fwd: Here is the the list of uids]" (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("David J Kavid" NIL "david.kavid" "generic.com")) NIL NIL "<72f9a217.a21772f9@generic.com>") (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 369 11 NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 2599 ("Tue, 9 Jul 2002 13:42:04 -0400" "Here is the the list of uids" (("Nicholas Kringle" NIL "nicholas.kringle" "generic.com")) (("Nicholas Kringle" NIL "nicholas.kringle" "generic.com")) (("Nicholas Kringle" NIL "nicholas.kringle" "generic.com")) (("Michael Etcetera" NIL "michael.etcetera" "generic.com")) (("Richard W Continued" NIL "richard.continued" "generic.com")) NIL NIL "<015401c2276f$f09b7c10$59cab08c@one.two.generic.com>") ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 256 10 NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 791 22 NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "----=_NextPart_001_0151_01C2274E.6969D0F0") NIL NIL) "MIXED" ("BOUNDARY" "----=_NextPart_000_0150_01C2274E.6969D0F0") NIL NIL) 75 NIL NIL NIL) "MIXED" ("BOUNDARY" "--1f34eac2082b02") NIL ("EN")) 118 NIL NIL NIL) "MIXED" ("BOUNDARY" "------------F600BD8FDDD648ABA72A09E0") NIL NIL))
 END_OF_BS2
 
 $bsobj = Mail::IMAPClient::BodyStructure->new($bs2) ;
@@ -26,4 +31,23 @@ is($bsobj->bodytype, 'MULTIPART', 'bodytype');
 is($bsobj->bodysubtype, 'MIXED', 'bodysubtype');
 
 is(join("#",$bsobj->parts),
-    "1#2#2.HEAD#2.1#2.2#2.2.HEAD#2.2.1#2.2.1.1#2.2.1.2", 'parts');
+  # Better parsing in version 3.03, changed this outcome
+  # "1#2#2.HEAD#2.1#2.2#2.2.HEAD#2.2.1#2.2.1.1#2.2.1.2"
+  "1#2#2.HEAD#2.1#2.1.1#2.1.2#2.1.2.HEAD#2.1.2.1#2.1.2.1.1#2.1.2.1.1.1#2.1.2.1.1.2"
+  , 'parts');
+
+my $bs3 = <<'END_OF_BS3';
+FETCH (UID 1 BODYSTRUCTURE (("TEXT" "PLAIN" ("charset" "ISO-8859-1")
+NIL NIL "quoted-printable" 1744 0)("TEXT" "HTML" ("charset"
+"ISO-8859-1") NIL NIL "quoted-printable" 1967 0) "ALTERNATIVE"))
+END_OF_BS3
+
+$bsobj = Mail::IMAPClient::BodyStructure->new($bs3) ;
+ok(defined $bsobj, 'parsed third');
+
+my $bs4 = <<'END_OF_BS4';
+* 9 FETCH (UID 9 BODYSTRUCTURE (("TEXT" "PLAIN" ("charset" "us-ascii") NIL "Notification" "7BIT" 588 0)("MESSAGE" "DELIVERY-STATUS" NIL NIL "Delivery report" "7BIT" 459)("MESSAGE" "RFC822" NIL NIL "Undelivered Message" "8bit" 10286 ("Thu, 31 May 2007 11:25:56 +0200 (CEST)" "*****SPAM***** RE: Daily News" (("admin@activtrades.com" NIL "polettld" "ensma.fr")) (("admin@activtrades.com" NIL "polettld" "ensma.fr")) (("admin@activtrades.com" NIL "polettld" "ensma.fr")) ((NIL NIL "polettld" "ensma.fr")) NIL NIL "NIL" "<20070531133257.92825.qmail@cc299962-a.haaks1.ov.home.nl>") (("TEXT" "PLAIN" ("charset" "iso-8859-1") NIL NIL "7bit" 1510 0)("MESSAGE" "RFC822" ("name" "message" "x-spam-type" "original") NIL "Original message" "8bit" 5718) "MIXED")) "REPORT"))
+END_OF_BS4
+
+$bsobj = Mail::IMAPClient::BodyStructure->new($bs4);
+ok(defined $bsobj, 'parsed fourth');
diff --git a/Mail-IMAPClient-3.00/t/messageset.t b/Mail-IMAPClient-3.05/t/messageset.t
similarity index 100%
rename from Mail-IMAPClient-3.00/t/messageset.t
rename to Mail-IMAPClient-3.05/t/messageset.t
diff --git a/Mail-IMAPClient-3.00/t/pod.t b/Mail-IMAPClient-3.05/t/pod.t
similarity index 100%
rename from Mail-IMAPClient-3.00/t/pod.t
rename to Mail-IMAPClient-3.05/t/pod.t
diff --git a/Mail-IMAPClient-3.00/t/thread.t b/Mail-IMAPClient-3.05/t/thread.t
similarity index 100%
rename from Mail-IMAPClient-3.00/t/thread.t
rename to Mail-IMAPClient-3.05/t/thread.t
diff --git a/Mail-IMAPClient-3.00/test_template.txt b/Mail-IMAPClient-3.05/test_template.txt
similarity index 100%
rename from Mail-IMAPClient-3.00/test_template.txt
rename to Mail-IMAPClient-3.05/test_template.txt
diff --git a/README b/README
index 737fa2d..0c84639 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ NAME
     Synchronise mailboxes between two imap servers. Good at IMAP migration.
     More than 32 different IMAP server softwares supported with success.
 
-    $Revision: 1.241 $
+    $Revision: 1.249 $
 
 INSTALL
      imapsync works fine under any Unix OS with perl.
@@ -333,5 +333,5 @@ SIMILAR SOFTWARES
 
     Feedback (good or bad) will be always welcome.
 
-    $Id: imapsync,v 1.241 2007/12/31 13:39:02 gilles Exp gilles $
+    $Id: imapsync,v 1.249 2008/03/19 02:14:24 gilles Exp $
 
diff --git a/TODO b/TODO
index ef8f9ec..7646004 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,13 @@
 TODO file for imapsync
 ----------------------
 
+Make "--delete 2" be a fatal error.
+
+Start an imap internet scan project.
+
+Explain howto change only the header with --regexmess
+
+Start a wiki for imapsync.
 
 Add a --pidfile option.
 Add a --tmpfile  option.
diff --git a/VERSION b/VERSION
index cbe4af0..6d648d8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.241
+1.249
diff --git a/bugs/lib/Mail/IMAPClient.pm b/bugs/lib/Mail/IMAPClient.pm
deleted file mode 100644
index a34a923..0000000
--- a/bugs/lib/Mail/IMAPClient.pm
+++ /dev/null
@@ -1,3768 +0,0 @@
-package Mail::IMAPClient;
-
-# $Id: IMAPClient.pm,v 1.1 2005/07/13 11:19:55 gilles Exp gilles $
-
-$Mail::IMAPClient::VERSION = '2.2.9';
-$Mail::IMAPClient::VERSION = '2.2.9';  	# do it twice to make sure it takes
-
-use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
-use Socket();
-use IO::Socket();
-use IO::Select();
-use IO::File();
-use Carp qw(carp);
-#use Data::Dumper;
-use Errno qw/EAGAIN/;
-
-#print "Found Fcntl in $INC{'Fcntl.pm'}\n";
-#Fcntl->import;
-
-use constant Unconnected => 0;
-
-use constant Connected         => 1;         	# connected; not logged in
-
-use constant Authenticated => 2;      		# logged in; no mailbox selected
-
-use constant Selected => 3;   		        # mailbox selected
-
-use constant INDEX => 0;              		# Array index for output line number
-
-use constant TYPE => 1;               		# Array index for line type 
-						#    (either OUTPUT, INPUT, or LITERAL)
-
-use constant DATA => 2;                       	# Array index for output line data
-
-use constant NonFolderArg => 1;			# Value to pass to Massage to 
-						# indicate non-folder argument
-
-
-
-my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
-	ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
-	FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
-	SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
-	TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED 
-	UNKEYWORD UNSEEN
-/;
-
-sub _debug {
-	my $self = shift;
-	return unless $self->Debug;
-	my $fh = $self->{Debug_fh} || \*STDERR; 
-	print $fh @_;
-}
-
-sub MaxTempErrors {
-	my $self = shift;
-	$_[0]->{Maxtemperrors} = $_[1] if defined($_[1]);
-	return $_[0]->{Maxtemperrors};
-}
-
-# This function is used by the accessor methods
-#
-sub _do_accessor {
-  my $datum = shift;
-
-  if ( defined($_[1]) and $datum eq 'Fast_io' and ref($_[0]->{Socket})) {
-    if ($_[1]) {                      # Passed the "True" flag
-      my $fcntl = 0;
-      eval { $fcntl=fcntl($_[0]->{Socket}, F_GETFL, 0) } ;
-      if ($@) {
-      $_[0]->{Fast_io} = 0;
-      carp ref($_[0]) . " not using Fast_IO; not available on this platform"
-        if ( ( $^W or $_[0]->Debug) and not $_[0]->{_fastio_warning_}++);
-      } else {
-      $_[0]->{Fast_io} = 1;
-      $_[0]->{_fcntl} = $fcntl;
-      my $newflags = $fcntl;
-      $newflags |= O_NONBLOCK;
-      fcntl($_[0]->{Socket}, F_SETFL, $newflags) ;
-      
-      }
-    } else {
-      eval { fcntl($_[0]->{Socket}, F_SETFL, $_[0]->{_fcntl}) } 
-		if exists $_[0]->{_fcntl};
-      $_[0]->{Fast_io} = 0;
-      delete $_[0]->{_fcntl} if exists $_[0]->{_fcntl};
-    }
-  } elsif ( defined($_[1]) and $datum eq 'Socket' ) {
-    
-    # Get rid of fcntl settings for obsolete socket handles:
-    delete $_[0]->{_fcntl} ;
-    # Register this handle in a select vector:
-    $_[0]->{_select} = IO::Select->new($_[1]) ;
-  }
-  
-  if (scalar(@_) > 1) {
-    $@ = $_[1] if $datum eq 'LastError';
-    chomp $@ if $datum eq 'LastError';
-    return $_[0]->{$datum} = $_[1] ;
-  } else {
-    return $_[0]->{$datum};
-  }
-}
-
-# the following for loop sets up eponymous accessor methods for 
-# the object's parameters:
-
-BEGIN {
- for my $datum (
-		qw( 	State Port Server Folder Fast_io Peek
-			User Password Socket Timeout Buffer
-			Debug LastError Count Uid Debug_fh Maxtemperrors
-			EnableServerResponseInLiteral
-			Authmechanism Authcallback Ranges
-			Readmethod Showcredentials
-			Prewritemethod
-		)
- ) {
-        no strict 'refs';
-        *$datum = sub { _do_accessor($datum, @_); };
- }
-
- eval {
-   require Digest::HMAC_MD5;
-   require MIME::Base64;
- };
- if ($@) {
-   $Mail::IMAPClient::_CRAM_MD5_ERR =
-     "Internal CRAM-MD5 implementation not available: $@";
-   $Mail::IMAPClient::_CRAM_MD5_ERR =~ s/\n+$/\n/;
- }
-}
-
-sub Wrap { 	shift->Clear(@_); 	}
-
-# The following class method is for creating valid dates in appended msgs:
-
-sub Rfc822_date {
-my $class=      shift;
-#Date: Fri, 09 Jul 1999 13:10:55 -0000#
-my $date =      $class =~ /^\d+$/ ? $class : shift ;
-my @date =      gmtime($date);
-my @dow  =      qw{ Sun Mon Tue Wed Thu Fri Sat };
-my @mnt  =      qw{ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec};
-#
-return          sprintf(
-                        "%s, %2.2d %s %4.4s %2.2d:%2.2d:%2.2d -%4.4d",
-                        $dow[$date[6]],
-                        $date[3],
-                        $mnt[$date[4]],
-                        $date[5]+=1900,
-                        $date[2],
-                        $date[1],
-                        $date[0],
-                        $date[8]) ;
-}
-
-# The following class method is for creating valid dates for use in IMAP search strings:
-
-sub Rfc2060_date {
-my $class=      shift;
-# 11-Jan-2000
-my $date =      $class =~ /^\d+$/ ? $class : shift ;
-my @date =      gmtime($date);
-my @mnt  =      qw{ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec};
-#
-return          sprintf(
-                        "%2.2d-%s-%4.4s",
-                        $date[3],
-                        $mnt[$date[4]],
-                        $date[5]+=1900
-		) ;
-}
-
-# The following class method strips out <CR>'s so lines end with <LF> 
-#	instead of <CR><LF>:
-
-sub Strip_cr {
-	my $class = shift;
-	unless ( ref($_[0]) or scalar(@_) > 1 ) {
-		(my $string = $_[0]) =~ s/\x0d\x0a/\x0a/gm;
-		return $string;
-	}
-	return wantarray ?     	map { s/\x0d\x0a/\0a/gm ; $_ }  
-				(ref($_[0]) ? @{$_[0]}  : @_)  		: 
-				[ map { s/\x0d\x0a/\x0a/gm ; $_ } 
-				  ref($_[0]) ? @{$_[0]} : @_ 
-				] ;
-}
-
-# The following defines a special method to deal with the Clear parameter:
-
-sub Clear {
-	my $self = shift;
-	defined(my $clear = shift) or return $self->{Clear}; 
-	
-	my $oldclear   = $self->{Clear};
-	$self->{Clear} = $clear;
-
-	my (@keys) = sort { $b <=> $a } keys %{$self->{"History"}}  ;
-
-	for ( my $i = $clear; $i < @keys ; $i++ ) 
-		{ delete $self->{'History'}{$keys[$i]} }
-
-	return $oldclear;
-}
-
-# read-only access to the transaction number:
-sub Transaction { shift->Count };
-
-# the constructor:
-sub new {
-	my $class 	= shift;
-	my $self  	= 	{
-		LastError	=> "", 
-		Uid 		=> 1, 
-		Count 		=> 0,
-		Fast_io 	=> 1,
-		"Clear"		=> 5, 
-	};
-	while (scalar(@_)) {
-		$self->{ucfirst(lc($_[0]))} = $_[1]; shift, shift;
-	}
-	bless $self, ref($class)||$class;
-
-	$self->State(Unconnected);
-
-	$self->{Debug_fh} ||= \*STDERR;
-	select((select($self->{Debug_fh}),$|++)[0]) ;
- 	$self->_debug("Using Mail::IMAPClient version $Mail::IMAPClient::VERSION " .
-		"and perl version " . (defined $^V ? join(".",unpack("CCC",$^V)) : "") . 
-		" ($])\n") if $self->Debug;
-	$self->LastError(0);
-	$self->Maxtemperrors or $self->Maxtemperrors("unlimited") ;
-	return $self->connect if $self->Server and !$self->Socket;
-	return $self;
-}
-
-
-sub connect {
-	my $self = shift;
-	
-	$self->Port(143) 
-		if 	defined ($IO::Socket::INET::VERSION) 
-		and 	$IO::Socket::INET::VERSION eq '1.25' 
-		and 	!$self->Port;
-	%$self = (%$self, @_);
-	my $sock = IO::Socket::INET->new(
-		PeerAddr => $self->Server		,
-                PeerPort => $self->Port||'imap(143)'	,
-                Proto    => 'tcp' 			,
-                Timeout  => $self->Timeout||0		,
-		Debug	=> $self->Debug 		,
-	)						;
-
-	unless ( defined($sock) ) {
-		
-		$self->LastError( "Unable to connect to $self->{Server}: $!\n");	
-		$@ 		= "Unable to connect to $self->{Server}: $!";	
-		carp 		  "Unable to connect to $self->{Server}: $!" 
-				unless defined wantarray;	
-		return undef;
-	}
-	$self->Socket($sock);
-	$self->State(Connected);
-
-	$sock->autoflush(1)				;
-	
-	my ($code, $output);
-        $output = "";
-
-        until ( $code ) {
-
-                $output = $self->_read_line or return undef;
-                for my $o (@$output) {
-			$self->_debug("Connect: Received this from readline: " . 
-					join("/",@$o) . "\n");
-                        $self->_record($self->Count,$o);	# $o is a ref
-                      next unless $o->[TYPE] eq "OUTPUT";
-                      ($code) = $o->[DATA] =~ /^\*\s+(OK|BAD|NO)/i  ;
-                }
-
-        }
-
-	if ($code =~ /BYE|NO /) {
-		$self->State(Unconnected);
-		return undef ;
-	}
-
-	if ($self->User and $self->Password) {
-		return $self->login ;
-	} else {
-		return $self;	
-	}
-}
-
-
-sub login {
-	my $self = shift;
-	return $self->authenticate($self->Authmechanism,$self->Authcallback) 
-		if $self->{Authmechanism};
-
-	my $id   = $self->User;
-	my $pass = $self->Password;
-	my $has_quotes = $id =~ /^".*"$/ ? 1 : 0;
-	my $string = 	"Login " . ( $has_quotes ? $id : qq("$id") ) . " " . 
-			qq("$pass")."\r\n";
-	#print "$string\n";
-	$self->_imap_command($string) 
-		and $self->State(Authenticated);
-	# $self->folders and $self->separator unless $self->NoAutoList;
-	unless ( $self->IsAuthenticated) {
-		my($carp) 	=  $self->LastError;
-		$carp 		=~ s/^[\S]+ ([^\x0d\x0a]*)\x0d?\x0a/$1/;
- 		carp $carp unless defined wantarray;
-		return undef;
-	}
-	return $self;
-}
-
-sub separator {
-	my $self = shift;
-	my $target = shift ; 
-
-	unless ( defined($target) ) {
-		my $sep = "";
-		# 	separator is namespace's 1st thing's 1st thing's 2nd thing:
-		eval { 	$sep = $self->namespace->[0][0][1] } 	;
-		return $sep if $sep;
-	}	
-		
-	defined($target) or $target = "";
-	$target ||= '""' ;
-	
-	
-
-	# The fact that the response might end with {123} doesn't really matter here:
-
-	unless (exists $self->{"$target${;}SEPARATOR"}) {
-		my $list = (grep(/^\*\s+LIST\s+/,($self->list(undef,$target)||("NO")) ))[0] || 
-				qq("/");
-		my $s = (split(/\s+/,$list))[3];
-		defined($s) and $self->{"$target${;}SEPARATOR"} = 
-				( $s eq 'NIL' ? 'NIL' : substr($s, 1,length($s)-2) );
-	}
-	return $self->{$target,'SEPARATOR'};
-}
-
-sub sort {
-    my $self = shift;
-    my @hits;
-    my @a = @_;
-    $@ = "";
-    $a[0] = "($a[0])" unless $a[0] =~ /^\(.*\)$/;      # wrap criteria in parens
-    $self->_imap_command( ( $self->Uid ? "UID " : "" ) . "SORT ". join(' ',@a))
-         or return wantarray ? @hits : \@hits ;
-    my @results =  $self->History($self->Count);
-
-    for my $r (@results) {
-        chomp $r;
-        $r =~ s/\r$//;
-        $r =~ s/^\*\s+SORT\s+// or next;   
-        push @hits, grep(/\d/,(split(/\s+/,$r)));
-    }
-    return wantarray ? @hits : \@hits;     
-}
-
-sub list {
-	my $self = shift;
-	my ($reference, $target) = (shift, shift);
-	$reference = "" unless defined($reference);
-	$target = '*' unless defined($target);
-	$target = '""' if $target eq "";
-	$target 	  = $self->Massage($target) unless $target eq '*' or $target eq '""';
-	my $string 	=  qq(LIST "$reference" $target);
-	$self->_imap_command($string)  or return undef;
-	return wantarray ? 	
-			$self->History($self->Count) 				  : 
-                       	[ map { $_->[DATA] } @{$self->{'History'}{$self->Count}}] ;
-}
-
-sub lsub {
-	my $self = shift;
-	my ($reference, $target) = (shift, shift);
-	$reference = "" unless defined($reference);
-	$target = '*' unless defined($target);
-	$target           = $self->Massage($target);
-	my $string      =  qq(LSUB "$reference" $target);
-	$self->_imap_command($string)  or return undef;
-	return wantarray ?      $self->History($self->Count)            : 
-                              [ map { $_->[DATA] } @{$self->{'History'}{$self->Count}}        ] ;
-}
-
-sub subscribed {
-        my $self = shift;
-	my $what = shift ;
-
-        my @folders ;  
-
-	my @list = $self->lsub(undef,( $what? "$what" . 
-		$self->separator($what) . "*" : undef ) );
-	push @list, $self->lsub(undef, $what) if $what and $self->exists($what) ;
-
-      	# my @list = map { $self->_debug("Pushing $_->[${\(DATA)}] \n"); $_->[DATA] } 
-	#	@$output;
-
-	my $m;
-
-	for ($m = 0; $m < scalar(@list); $m++ ) {
-		if ($list[$m] && $list[$m]  !~ /\x0d\x0a$/ ) {
-			$list[$m] .= $list[$m+1] ;
-			$list[$m+1] = "";	
-		}
-			
-		
-		# $self->_debug("Subscribed: examining $list[$m]\n");
-
-		push @folders, $1||$2 
-			if $list[$m] =~
-                        /       ^\*\s+LSUB               # * LSUB
-                                \s+\([^\)]*\)\s+         # (Flags)
-                                (?:"[^"]*"|NIL)\s+	 # "delimiter" or NIL
-                                (?:"([^"]*)"|(.*))\x0d\x0a$  # Name or "Folder name"
-                        /ix;
-
-        } 
-
-        # for my $f (@folders) { $f =~ s/^\\FOLDER LITERAL:://;}
-	my @clean = () ; my %memory = (); 
-	foreach my $f (@folders) { push @clean, $f unless $memory{$f}++ }
-        return wantarray ? @clean : \@clean ;
-}
-
-
-sub deleteacl {
-	my $self = shift;
-	my ($target, $user ) = @_;
-	$target 	  = $self->Massage($target);
-	$user		  =~ s/^"(.*)"$/$1/;
-	$user 	  	  =~ s/"/\\"/g;
-	my $string 	=  qq(DELETEACL $target "$user");
-	$self->_imap_command($string)  or return undef;
-
-	return wantarray ? 	$self->History($self->Count) 				: 
-                              [ map {$_->[DATA] } @{$self->{'History'}{$self->Count}}] ;
-}
-
-sub setacl {
-        my $self = shift;
-        my ($target, $user, $acl) = @_;
-        $user = $self->User unless length($user);
-        $target = $self->Folder unless length($target);
-        $target           = $self->Massage($target);
-        $user             =~ s/^"(.*)"$/$1/;
-        $user             =~ s/"/\\"/g;
-        $acl              =~ s/^"(.*)"$/$1/;
-        $acl              =~ s/"/\\"/g;
-        my $string      =  qq(SETACL $target "$user" "$acl");
-        $self->_imap_command($string)  or return undef;
-        return wantarray			?
-		$self->History($self->Count)	:
-		[map{$_->[DATA]}@{$self->{'History'}{$self->Count}}]
-	;
-}
-
-
-sub getacl {
-        my $self = shift;
-        my ($target) = @_;
-        $target = $self->Folder unless defined($target);
-        my $mtarget           = $self->Massage($target);
-        my $string      =  qq(GETACL $mtarget);
-        $self->_imap_command($string)  or return undef;
-	my @history = $self->History($self->Count);
-	#$self->_debug("Getacl history: ".join("|",@history).">>>End of History<<<" ) ;
-	my $perm = ""; 
-	my $hash = {};
-	for ( my $x = 0; $x < scalar(@history) ; $x++ ) {
-        	if ( $history[$x] =~ /^\* ACL/ ) {
-			
-			$perm = $history[$x]=~ /^\* ACL $/	? 
-				$history[++$x].$history[++$x] 	: 
-				$history[$x];		
-
-			$perm =~ s/\s?\x0d\x0a$//;
-			piece:  until ( $perm =~ /\Q$target\E"?$/ or !$perm) {
-				#$self->_debug(qq(Piece: permline=$perm and " 
-				#	"pattern = /\Q$target\E"? \$/));
-				$perm =~ s/\s([^\s]+)\s?$// or last piece;
-				my($p) = $1;
-				$perm =~ s/\s([^\s]+)\s?$// or last piece;
-				my($u) = $1;
-				$hash->{$u} = $p;
-				$self->_debug("Permissions: $u => $p \n");
-			}
-		
-		}
-	}
-        return $hash;
-}
-
-sub listrights {
-	my $self = shift;
-	my ($target, $user) = @_;
-	$user = $self->User unless defined($user);
-	$target = $self->Folder unless defined($target);
-	$target 	  = $self->Massage($target);
-	$user		  =~ s/^"(.*)"$/$1/;
-	$user 	  	  =~ s/"/\\"/g;
-	my $string 	=  qq(LISTRIGHTS $target "$user");
-	$self->_imap_command($string)  or return undef;
-	my $resp = ( grep(/^\* LISTRIGHTS/, $self->History($self->Count) ) )[0];
-	my @rights = split(/\s/,$resp);	
-	shift @rights, shift @rights, shift @rights, shift @rights;
-	my $rights = join("",@rights);
-	$rights =~ s/"//g;	
-	return wantarray ? split(//,$rights) : $rights ;
-}
-
-sub select {
-	my $self = shift;
-	my $target = shift ;  
-	return undef unless defined($target);
-
-	my $qqtarget = $self->Massage($target);
-
-	my $string 	=  qq/SELECT $qqtarget/;
-
-	my $old = $self->Folder;
-
-	if ($self->_imap_command($string) and $self->State(Selected)) {
-		$self->Folder($target);
-		return $old||$self;
-	} else { 
-		return undef;
-	}
-}
-
-sub message_string {
-	my $self = shift;
-	my $msg  = shift;
-	my $expected_size = $self->size($msg);
-	return undef unless(defined $expected_size);	# unable to get size
-	my $cmd  =  	$self->has_capability('IMAP4REV1') 				? 
-				"BODY" . ( $self->Peek ? '.PEEK[]' : '[]' ) 		: 
-				"RFC822" .  ( $self->Peek ? '.PEEK' : ''  )		;
-
-	$self->fetch($msg,$cmd) or return undef;
-	
-	my $string = "";
-
-	foreach my $result  (@{$self->{"History"}{$self->Transaction}}) { 
-              $string .= $result->[DATA] 
-		if defined($result) and $self->_is_literal($result) ;
-	}      
-	# BUG? should probably return undef if length != expected
-	if ( length($string) != $expected_size ) { 
-		carp "${self}::message_string: " .
-			"expected $expected_size bytes but received " . 
-			length($string) 
-			if $self->Debug or $^W; 
-	}
-	if ( length($string) > $expected_size ) 
-	{ $string = substr($string,0,$expected_size) }
-	if ( length($string) < $expected_size ) {
-		$self->LastError("${self}::message_string: expected ".
-			"$expected_size bytes but received " . 
-			length($string)."\n");
-		return undef;
-	}
-	return $string;
-}
-
-sub bodypart_string {
-	my($self, $msg, $partno, $bytes, $offset) = @_;
-
-	unless ( $self->has_capability('IMAP4REV1') ) {
-		$self->LastError(
-				"Unable to get body part; server " . 
-				$self->Server . 
-				" does not support IMAP4REV1"
-		);
-		return undef;
-	}
-	my $cmd = "BODY" . ( $self->Peek ? ".PEEK[$partno]" : "[$partno]" ) 	;
-	$offset ||= 0 ;
-	$cmd .= "<$offset.$bytes>" if $bytes;
-
-	$self->fetch($msg,$cmd) or return undef;
-	
-	my $string = "";
-
-	foreach my $result  (@{$self->{"History"}{$self->Transaction}}) { 
-              $string .= $result->[DATA] 
-		if defined($result) and $self->_is_literal($result) ;
-	}      
-	return $string;
-}
-
-sub message_to_file {
-	my $self = shift;
-	my $fh   = shift;
-	my @msgs = @_;
-	my $handle;
-
-	if ( ref($fh) ) {
-		$handle = $fh;
-	} else { 
-		$handle = IO::File->new(">>$fh");
-		unless ( defined($handle)) {
-			$@ = "Unable to open $fh: $!";
-			$self->LastError("Unable to open $fh: $!\n");
-			carp $@ if $^W;
-			return undef;
-		}
-		binmode $handle;	# For those of you who need something like this...
-	} 
-
-        my $clear = $self->Clear;
-	my $cmd = $self->Peek ? 'BODY.PEEK[]' : 'BODY[]';
-	$cmd = $self->Peek ? 'RFC822.PEEK' : 'RFC822' unless $self->imap4rev1;
-	
-	my $string = ( $self->Uid ? "UID " : "" ) . "FETCH " . join(",",@msgs) . " $cmd";
-
-        $self->Clear($clear)
-                if $self->Count >= $clear and $clear > 0;
-
-        my $trans       = $self->Count($self->Count+1);
-
-        $string         = "$trans $string" ;
-
-        $self->_record($trans,[ 0, "INPUT", "$string\x0d\x0a"] );
-
-        my $feedback = $self->_send_line("$string");
-
-        unless ($feedback) {
-                $self->LastError( "Error sending '$string' to IMAP: $!\n");
-                $@ = "Error sending '$string' to IMAP: $!";
-                return undef;
-        }
-
-        my ($code, $output);
-        $output = "";
-
-        READ: until ( $code)  {
-                $output = $self->_read_line($handle) or return undef; # avoid possible infinite loop
-                for my $o (@$output) {
-                        $self->_record($trans,$o);	# $o is a ref
-                        # $self->_debug("Received from readline: ${\($o->[DATA])}<<END OF RESULT>>\n");
-                        next unless $self->_is_output($o);
-                        ($code) = $o->[DATA] =~ /^$trans (OK|BAD|NO)/mi ;
-                        if ($o->[DATA] =~ /^\*\s+BYE/im) {
-                                $self->State(Unconnected);
-                                return undef ;
-                        }
-                }
-        }
-
-        # $self->_debug("Command $string: returned $code\n");
-	close $handle unless ref($fh);
-        return $code =~ /^OK/im ? $self : undef ;
-
-}
-
-sub message_uid {
-	my $self = shift;
-	my $msg  = shift;
-	my @uid = $self->fetch($msg,"UID");
-	my $uid;
-	while ( my $u = shift @uid and !$uid) {
-		($uid) = $u =~ /\(UID\s+(\d+)\s*\)\r?$/;
-	}
-	return $uid;
-}
-
-sub original_migrate {
-	my($self,$peer,$msgs,$folder) = @_;
-	unless ( eval { $peer->IsConnected } ) {
-		$self->LastError("Invalid or unconnected " .  ref($self). 
-				 " object used as target for migrate." );
-		return undef;
-	}
-	unless ($folder) {
-		$folder = $self->Folder;
-		$peer->exists($folder) 		or 
-			$peer->create($folder) 	or 
-			(
-				$self->LastError("Unable to created folder $folder on target mailbox: ".
-					"$peer->LastError") and 
-				return undef 
-			) ;
-	}			
-	if ( $msgs =~ /^all$/i ) { $msgs = $self->search("ALL") }
-	foreach my $mid ( ref($msgs) ? @$msgs : $msgs ) {
-		my $uid = $peer->append($folder,$self->message_string($mid));
-		$self->LastError("Trouble appending to peer: " . $peer->LastError . "\n");
-	}
-}
-
-
-sub migrate {
-
-	my($self,$peer,$msgs,$folder) 	= @_;
-	my($toSock,$fromSock) 		= ( $peer->Socket, $self->Socket);
-	my $bufferSize 			= $self->Buffer || 4096;
-	my $fromBuffer 			= "";
-	my $clear 			= $self->Clear;
-
-	unless ( eval { $peer->IsConnected } ) {
-		$self->LastError("Invalid or unconnected " . 
-			ref($self) . " object used as target for migrate. $@");
-		return undef;
-	}
-
-	unless ($folder) {
-		$folder = $self->Folder 	or
-			$self->LastError( "No folder selected on source mailbox.") 
-			and return undef;
-
-		$peer->exists($folder)		or 
-			$peer->create($folder)	or 
-			(
-				$self->LastError(
-				  "Unable to create folder $folder on target mailbox: ".
-				  $peer->LastError . "\n"
-				) and return undef 
-			) ;
-	}
-	$msgs or $msgs eq "0" or $msgs = "all";	
-	if ( $msgs =~ /^all$/i ) { $msgs = $self->search("ALL") }
-	my $range = $self->Range($msgs) ;
-	$self->_debug("Migrating the following msgs from $folder: " . 
-		" $range\n");
-		# ( ref($msgs) ? join(", ",@$msgs) : $msgs) );
-
-	#MIGMSG:	foreach my $mid ( ref($msgs) ? @$msgs : (split(/,\s*/,$msgs)) ) {#}
-	MIGMSG:	foreach my $mid ( $range->unfold ) {
-		# Set up counters for size of msg and portion of msg remaining to
-		# process:
-		$self->_debug("Migrating message $mid in folder $folder\n") 
-			if $self->Debug;
-		my $leftSoFar = my $size = $self->size($mid);
-
-		# fetch internaldate and flags of original message:
-		my $intDate = '"' . $self->internaldate($mid) . '"' ;
-		my $flags   = "(" . join(" ",grep(!/\\Recent/i,$self->flags($mid)) ) . ")" ;
-		$flags = "" if  $flags eq "()" ;
-
-		# set up transaction numbers for from and to connections:
-		my $trans       = $self->Count($self->Count+1);
-		my $ptrans      = $peer->Count($peer->Count+1);
-
-		# If msg size is less than buffersize then do whole msg in one 
-		# transaction:
-		if ( $size <= $bufferSize ) {
-			my $new_mid = $peer->append_string($peer->Massage($folder),
-					$self->message_string($mid) ,$flags,
-					$intDate) ;
-		        $self->_debug("Copied message $mid in folder $folder to " . 
-				    $peer->User .
-				    '@' . $peer->Server . 
-				    ". New Message UID is $new_mid.\n" 
-		        ) if $self->Debug;
-
-		        $peer->_debug("Copied message $mid in folder $folder from " . 
-				$self->User .
-				'@' . $self->Server . ". New Message UID is $new_mid.\n" 
-		        ) if $peer->Debug;
-
-
-			next MIGMSG;
-		}
-
-		# otherwise break it up into digestible pieces:
-		my ($cmd, $pattern);
-		if ( $self->imap4rev1 ) {
-			# imap4rev1 supports FETCH BODY 
-			$cmd = $self->Peek ? 'BODY.PEEK[]' : 'BODY[]';
-			$pattern = sub {
-                                #$self->_debug("Data fed to pattern: $_[0]<END>\n");
-                                my($one) = $_[0] =~ /\(.*BODY\[\]<\d+> \{(\d+)\}/i ; # ;-)
-					# or $self->_debug("Didn't match pattern\n") ; 
-                                #$self->_debug("Returning from pattern: $1\n") if defined($1);
-				return $one ;
-                        } ;
-		} else {
-			# older imaps use (deprecated) FETCH RFC822:
-			$cmd = $self->Peek ? 'RFC822.PEEK' : 'RFC822' ;
-			$pattern = sub {
-				my($one) = shift =~ /\(RFC822\[\]<\d+> \{(\d+)\}/i; 
-				return $one ;
-			};
-		}
-
-
-		# Now let's warn the peer that there's a message coming:
-
-		my $pstring = 	"$ptrans APPEND " . 
-				$self->Massage($folder). 
-				" " . 
-				( $flags ? "$flags " : () ) . 
-				( $intDate ? "$intDate " : () ) . 
-				"{" . $size . "}"  ;
-
-		$self->_debug("About to issue APPEND command to peer " .
-			"for msg $mid\n") 		if $self->Debug;
-
-		my $feedback2 = $peer->_send_line( $pstring ) ;
-
-		$peer->_record($ptrans,[ 
-			0, 
-			"INPUT", 
-			"$pstring" ,
-		] ) ;
-		unless ($feedback2) {
-		   $self->LastError("Error sending '$pstring' to target IMAP: $!\n");
-		   return undef;
-		}
-		# Get the "+ Go ahead" response:
-		my $code = 0;
-		until ($code eq '+' or $code =~ /NO|BAD|OK/ ) {
-	  	  my $readSoFar = 0 ;
-		  $readSoFar += sysread($toSock,$fromBuffer,1,$readSoFar)||0
-			until $fromBuffer =~ /\x0d\x0a/;
-
-		  #$peer->_debug("migrate: response from target server: " .
-		  #	"$fromBuffer<END>\n") 	if $peer->Debug;
-
-		  ($code)= $fromBuffer =~ /^(\+)|^(?:\d+\s(?:BAD|NO))/ ;
-		  $code ||=0;
-
-		  $peer->_debug( "$folder: received $fromBuffer from server\n") 
-		  if $peer->Debug;
-
-	  	  # ... and log it in the history buffers
-		  $self->_record($trans,[ 
-			0, 
-			"OUTPUT", 
-			"Mail::IMAPClient migrating message $mid to $peer->User\@$peer->Server"
-		  ] ) ;
-		  $peer->_record($ptrans,[ 
-			0, 
-			"OUTPUT", 
-			$fromBuffer
-		  ] ) ;
-
-
-		}
-		unless ( $code eq '+'  ) {
-			$^W and warn "$@\n";
-			$self->Debug and $self->_debug("Error writing to target host: $@\n");
-			next MIGMSG;	
-		}
-		# Here is where we start sticking in UID if that parameter
-		# is turned on:	
-		my $string = ( $self->Uid ? "UID " : "" ) . "FETCH $mid $cmd";
-
-		# Clean up history buffer if necessary:
-		$self->Clear($clear)
-			if $self->Count >= $clear and $clear > 0;
-
-
-	   # position will tell us how far from beginning of msg the
-	   # next IMAP FETCH should start (1st time start at offet zero):
-	   my $position = 0;
-	   #$self->_debug("There are $leftSoFar bytes left versus a buffer of $bufferSize bytes.\n");
-	   my $chunkCount = 0;
-	   while ( $leftSoFar > 0 ) {
-		$self->_debug("Starting chunk " . ++$chunkCount . "\n");
-
-		my $newstring         ="$trans $string<$position."  .
-					( $leftSoFar > $bufferSize ? $bufferSize : $leftSoFar ) . 
-					">" ;
-
-		$self->_record($trans,[ 0, "INPUT", "$newstring\x0d\x0a"] );
-		$self->_debug("Issuing migration command: $newstring\n" )
-			if $self->Debug;;
-
-		my $feedback = $self->_send_line("$newstring");
-
-		unless ($feedback) {
-		   $self->LastError("Error sending '$newstring' to source IMAP: $!\n");
-		   return undef;
-		}
-		my $chunk = "";
-		until ($chunk = $pattern->($fromBuffer) ) {
-		   $fromBuffer = "" ;
-	    	   until ( $fromBuffer=~/\x0d\x0a$/ ) {
-	    	   	sysread($fromSock,$fromBuffer,1,length($fromBuffer)) ; 
-			#$self->_debug("migrate chunk $chunkCount:" . 
-			#	"Read from source: $fromBuffer<END>\n");
-		   }
-		   
-		   $self->_record($trans,[ 0, "OUTPUT", "$fromBuffer"] ) ;
-
-		   if ( $fromBuffer =~ /^$trans (?:NO|BAD)/ ) {
-			$self->LastError($fromBuffer) ;
-			next MIGMSG;
-		   }
-
-		   if ( $fromBuffer =~ /^$trans (?:OK)/ ) {
-			$self->LastError("Unexpected good return code " .
-				"from source host: " . $fromBuffer) ;
-			next MIGMSG;
-		   }
-
-		}
-		$fromBuffer = "";
-		my $readSoFar = 0 ;
-		$readSoFar += sysread($fromSock,$fromBuffer,$chunk-$readSoFar,$readSoFar)||0
-			until $readSoFar >= $chunk;
-		#$self->_debug("migrateRead: chunk=$chunk readSoFar=$readSoFar " .
-		#	"Buffer=$fromBuffer<END_OF_BUFFER\n") if $self->Debug;
-
-		my $wroteSoFar 	= 0;
-		my $temperrs 	= 0;
-		my $optimize 	= 0;
-
-		until ( $wroteSoFar >= $chunk ) {
-		 #$peer->_debug("Chunk $chunkCount: Next write will attempt to write " .
-		 #	"this substring:\n" .
-		 #	substr($fromBuffer,$wroteSoFar,$chunk-$wroteSoFar) .
-		 #	"<END_OF_SUBSTRING>\n"
-		 #);
-
-		 until ( $wroteSoFar >= $readSoFar ) {
-		    $!=0;
-		    my $ret = syswrite(
-				$toSock,
-				$fromBuffer,
-				$chunk - $wroteSoFar, 
-				$wroteSoFar )||0 ;
-
-		    $wroteSoFar += $ret;
-
-		    if ($! == &EAGAIN ) {
-			if ( 	$self->{Maxtemperrors} !~ /^unlimited/i
-			    	and $temperrs++ > ($self->{Maxtemperrors}||10) 
-			) {
-				$self->LastError("Persistent '${!}' errors\n");
-				$self->_debug("Persistent '${!}' errors\n");
-				return undef;
-			}
-			$optimize = 1;
-		    } else {
-			# avoid infinite loops on syswrite error
-			return undef unless(defined $ret);	 
-		    }
-		    # Optimization of wait time between syswrite calls
-		    # only runs if syscalls run too fast and fill the 
-		    # buffer causing "EAGAIN: Resource Temp. Unavail" errors. The
-		    # premise is that $maxwrite will be approx. the same as 
-		    # the smallest buffer between the sending and receiving side. 
-		    # Waiting time between syscalls should ideally be exactly as 
-		    # long as it takes the receiving side to empty that buffer, 
-		    # minus a little bit to prevent it from
-		    # emptying completely and wasting time in the select call.
-		    if ($optimize) {
-		        my $waittime = .02; 
-		    	$maxwrite = $ret if $maxwrite < $ret;
-		    	push( @last5writes, $ret );
-		    	shift( @last5writes ) if $#last5writes > 5;
-			    my $bufferavail = 0;
-			    $bufferavail += $_ for ( @last5writes );
-			    $bufferavail /= ($#last5writes||1);
-			    # Buffer is staying pretty full; 
-			    # we should increase the wait period
-			    # to reduce transmission overhead/number of packets sent
-			    if ( $bufferavail < .4 * $maxwrite ) {
-				$waittime *= 1.3;
-
-			    # Buffer is nearly or totally empty; 
-			    # we're wasting time in select
-			    # call that could be used to send data, 
-			    # so reduce the wait period
-			    } elsif ( $bufferavail > .9 * $maxwrite ) {
-				$waittime *= .5;
-			    }
-		    	CORE::select(undef, undef, undef, $waittime);
-		    }
-		    if ( defined($ret) ) {
-			$temperrs = 0  ;
-		    }
-		    $peer->_debug("Chunk $chunkCount: " .
-			"Wrote $wroteSoFar bytes (out of $chunk)\n");
-		   }
-		}
-		$position += $readSoFar ;
-		$leftSoFar -= $readSoFar;
-		$fromBuffer = "";
-		# Finish up reading the server response from the fetch cmd
-		# 	on the source system:
-		{
-		my $code = 0;
-		until ( $code)  {
-
-			# escape infinite loop if read_line never returns any data:
-
-			$self->_debug("Reading from source server; expecting " .
-				"') OK' type response\n") if $self->Debug;
-
-			$output = $self->_read_line or return undef; 
-			for my $o (@$output) {
-
-				$self->_record($trans,$o);      # $o is a ref
-
-				# $self->_debug("Received from readline: " .
-				# "${\($o->[DATA])}<<END OF RESULT>>\n");
-
-				next unless $self->_is_output($o);
-
-				($code) = $o->[DATA] =~ /^$trans (OK|BAD|NO)/mi ;
-
-				if ($o->[DATA] =~ /^\*\s+BYE/im) {
-					$self->State(Unconnected);
-					return undef ;
-				}
-	   		}
-	   	}
-	   	} # end scope for my $code
-	   }
-	   # Now let's send a <CR><LF> to the peer to signal end of APPEND cmd:
-	   {
-	    my $wroteSoFar = 0;
-	    $fromBuffer = "\x0d\x0a";
-	    $!=0;
-	    $wroteSoFar += syswrite($toSock,$fromBuffer,2-$wroteSoFar,$wroteSoFar)||0 
-	    		until $wroteSoFar >= 2;
-
-	   }
-	   # Finally, let's get the new message's UID from the peer:
-	   my $new_mid = "";
-           {
-                my $code = 0;
-                until ( $code)  {
-                        # escape infinite loop if read_line never returns any data:
-			$peer->_debug("Reading from target: " .
-				"expecting new uid in response\n") if $peer->Debug;
-
-                        $output = $peer->_read_line or next MIGMSG;
-
-                        for my $o (@$output) {
-
-                                $peer->_record($ptrans,$o);      # $o is a ref
-
-                                # $peer->_debug("Received from readline: " .
-                                # "${\($o->[DATA])}<<END OF RESULT>>\n");
-
-                                next unless $peer->_is_output($o);
-
-                                ($code) = $o->[DATA] =~ /^$ptrans (OK|BAD|NO)/mi ;
-				($new_mid)= $o->[DATA] =~ /APPENDUID \d+ (\d+)/ if $code;
-				#$peer->_debug("Code line: " . $o->[DATA] . 
-				#	"\nCode=$code mid=$new_mid\n" ) if $code;
-
-                                if ($o->[DATA] =~ /^\*\s+BYE/im) {
-                                        $peer->State(Unconnected);
-                                        return undef ;
-                                }
-                        }
-			$new_mid||="unknown" ;
-                }
-             } # end scope for my $code
-
-	     $self->_debug("Copied message $mid in folder $folder to " . $peer->User .
-			    '@' . $peer->Server . ". New Message UID is $new_mid.\n" 
-	     ) if $self->Debug;
-
-	     $peer->_debug("Copied message $mid in folder $folder from " . $self->User .
-			    '@' . $self->Server . ". New Message UID is $new_mid.\n" 
-	     ) if $peer->Debug;
-
-
-	  # ... and finish up reading the server response from the fetch cmd
-	  # 	on the source system:
-	      # {
-	#	my $code = 0;
-	#	until ( $code)  {
-	#		# escape infinite loop if read_line never returns any data:
-        #      		unless ($output = $self->_read_line ) {
-	#			$self->_debug($self->LastError) ;
-	#			next MIGMSG;
-	#		}
-	#		for my $o (@$output) {
-#
-#				$self->_record($trans,$o);      # $o is a ref
-#
-#				# $self->_debug("Received from readline: " .
-#				# "${\($o->[DATA])}<<END OF RESULT>>\n");
-#
-#				next unless $self->_is_output($o);
-#
-#			 	($code) = $o->[DATA] =~ /^$trans (OK|BAD|NO)/mi ;
-#
-#			      	if ($o->[DATA] =~ /^\*\s+BYE/im) {
-#					$self->State(Unconnected);
-#					return undef ;
-#				}
-#			}
-#		}
-#		}
-		
-	     	# and clean up the I/O buffer:
-	     	$fromBuffer = "";
-	     }
-	return $self;	
-}
-
-
-sub body_string {
-	my $self = shift;
-	my $msg  = shift;
-	my $ref = $self->fetch($msg,"BODY" . ( $self->Peek ? ".PEEK" : "" ) . "[TEXT]");
-
-        my $string = "";
-    	foreach my $result  (@{$ref}) 	{ 
-                $string .= $result->[DATA] if defined($result) and $self->_is_literal($result) ;
-        }
-	return $string if $string;
-
-        my $head = shift @$ref;
-        $self->_debug("body_string: first shift = '$head'\n");
-
-        until ( (! $head)  or $head =~ /(?:.*FETCH .*\(.*BODY\[TEXT\])|(?:^\d+ BAD )|(?:^\d NO )/i ) {
-                $self->_debug("body_string: shifted '$head'\n");
-                $head = shift(@$ref) ;
-        }
-	unless ( scalar(@$ref) ) {
-			$self->LastError("Unable to parse server response from " . $self->LastIMAPCommand );
-			return undef ;
-	}
-	my $popped ; $popped = pop @$ref until 	
-			( 
-				( 	defined($popped) and 
-					# (-:	Smile!
-					$popped =~ /\)\x0d\x0a$/ 
-				) 	or
-					not grep(
-						# (-:	Smile again!
-						/\)\x0d\x0a$/,
-						@$ref
-					)
-			);
-
-        if      ($head =~ /BODY\[TEXT\]\s*$/i )     {       # Next line is a literal
-                        $string .= shift @$ref while scalar(@$ref);
-                        $self->_debug("String is now $string\n") if $self->Debug;
-        }
-
-        return $string||undef;
-}
-
-
-sub examine {
-	my $self = shift;
-	my $target = shift ; return undef unless defined($target);
-	$target = $self->Massage($target);
-	my $string 	=  qq/EXAMINE $target/;
-
-	my $old = $self->Folder;
-
-	if ($self->_imap_command($string) and $self->State(Selected)) {
-		$self->Folder($target);
-		return $old||$self;
-	} else { 
-		return undef;
-	}
-}
-
-sub idle {
-	my $self = shift;
-	my $good = '+';
-	my $count = $self->Count +1;
-	return $self->_imap_command("IDLE",$good) ? $count : undef;
-}
-
-sub done {
-	my $self 	= shift;
-
-	my $count 	= shift||$self->Count;
-
-	my $clear = "";
-	$clear = $self->Clear;
-
-	$self->Clear($clear) 
-		if $self->Count >= $clear and $clear > 0;
-
-	my $string = "DONE\x0d\x0a";
-	$self->_record($count,[ $self->_next_index($count), "INPUT", "$string\x0d\x0a"] );
-
-	my $feedback = $self->_send_line("$string",1);
-
-	unless ($feedback) {
-		$self->LastError( "Error sending '$string' to IMAP: $!\n");
-		return undef;
-	}
-
-	my ($code, $output);	
-	$output = "";
-
-	until ( $code and $code =~ /(OK|BAD|NO)/m ) {
-
-		$output = $self->_read_line or return undef;	
-		for my $o (@$output) { 
-			$self->_record($count,$o);	# $o is a ref
-			next unless $self->_is_output($o);
-                      	($code) = $o->[DATA] =~ /^(?:$count) (OK|BAD|NO)/m  ;
-                      if ($o->[DATA] =~ /^\*\s+BYE/) {
-				$self->State(Unconnected);
-			}
-		}
-	}	
-	return $code =~ /^OK/ ? @{$self->Results} : undef ;
-
-}
-
-sub tag_and_run {
-	my $self = shift;
-	my $string = shift;
-	my $good = shift;
-	$self->_imap_command($string,$good);
-	return @{$self->Results};
-}
-# _{name} methods are undocumented and meant to be private.
-
-# _imap_command runs a command, inserting the correct tag
-# and <CR><LF> and whatnot.
-# When updating _imap_command, remember to examine the run method, too, since it is very similar.
-#
-
-sub _imap_command {
-	
-	my $self 	= shift;
-	my $string 	= shift 	or return undef;
-	my $good 	= shift 	|| 'GOOD';
-
-	my $qgood = quotemeta($good);
-
-	my $clear = "";
-	$clear = $self->Clear;
-
-	$self->Clear($clear) 
-		if $self->Count >= $clear and $clear > 0;
-
-	my $count 	= $self->Count($self->Count+1);
-
-	$string 	= "$count $string" ;
-
-	$self->_record($count,[ 0, "INPUT", "$string\x0d\x0a"] );
-
-	my $feedback = $self->_send_line("$string");
-
-	unless ($feedback) {
-		$self->LastError( "Error sending '$string' to IMAP: $!\n");
-		$@ = "Error sending '$string' to IMAP: $!";
-		carp "Error sending '$string' to IMAP: $!" if $^W;
-		return undef;
-	}
-
-	my ($code, $output);	
-	$output = "";
-
-	READ: until ( $code)  {
-	    	# escape infinite loop if read_line never returns any data:
-              	$output = $self->_read_line or return undef; 
-
-		for my $o (@$output) { 
-			$self->_record($count,$o);	# $o is a ref
-                      # $self->_debug("Received from readline: ${\($o->[DATA])}<<END OF RESULT>>\n");
-			next unless $self->_is_output($o);
-			if ( $good eq '+' ) {
-                      		$o->[DATA] =~ /^$count (OK|BAD|NO|$qgood)|^($qgood)/mi ;
-				$code = $1||$2 ;
-			} else {
-                      		($code) = $o->[DATA] =~ /^$count (OK|BAD|NO|$qgood)/mi ;
-			}
-                      if ($o->[DATA] =~ /^\*\s+BYE/im) {
-				$self->State(Unconnected);
-				return undef ;
-			}
-		}
-	}	
-	
-	# $self->_debug("Command $string: returned $code\n");
-	return $code =~ /^OK|$qgood/im ? $self : undef ;
-
-}
-
-sub run {
-	my $self 	= shift;
-	my $string 	= shift 	or return undef;
-	my $good 	= shift 	|| 'GOOD';
-	my $count 	= $self->Count($self->Count+1);
-	my($tag)	= $string =~ /^(\S+) /  ;
-
-	unless ($tag) {
-		$self->LastError("Invalid string passed to run method; no tag found.\n");
-	}
-
-	my $qgood = quotemeta($good);
-
-	my $clear = "";
-	$clear = $self->Clear;
-
-	$self->Clear($clear) 
-		if $self->Count >= $clear and $clear > 0;
-
-	$self->_record($count,[ $self->_next_index($count), "INPUT", "$string"] );
-
-	my $feedback = $self->_send_line("$string",1);
-
-	unless ($feedback) {
-		$self->LastError( "Error sending '$string' to IMAP: $!\n");
-		return undef;
-	}
-
-	my ($code, $output);	
-	$output = "";
-
-	until ( $code =~ /(OK|BAD|NO|$qgood)/m ) {
-
-		$output = $self->_read_line or return undef;	
-		for my $o (@$output) { 
-			$self->_record($count,$o);	# $o is a ref
-			next unless $self->_is_output($o);
-			if ( $good eq '+' ) {
-			   $o->[DATA] =~ /^(?:$tag|\*) (OK|BAD|NO|$qgood)|(^$qgood)/m  ;
-			   $code = $1||$2;
-			} else {
-                      		($code) = 
-				   $o->[DATA] =~ /^(?:$tag|\*) (OK|BAD|NO|$qgood)/m  ;
-			}
-                      if ($o->[DATA] =~ /^\*\s+BYE/) {
-				$self->State(Unconnected);
-			}
-		}
-	}	
-	$self->{'History'}{$tag} = $self->{"History"}{$count} unless $tag eq $count;
-	return $code =~ /^OK|$qgood/ ? @{$self->Results} : undef ;
-
-}
-#sub bodystruct {	# return bodystruct 
-#}
-
-# _record saves the conversation into the History structure:
-sub _record {
-
-	my ($self,$count,$array) = ( shift, shift, shift);
-	local($^W)= undef;
-
-	#$self->_debug(sprintf("in _record: count is $count, values are %s/%s/%s and caller is " . 
-	#	join(":",caller()) . "\n",@$array));
-	
-      if (    #       $array->[DATA] and 
-              $array->[DATA] =~ /^\d+ LOGIN/i and
-		! $self->Showcredentials
-      ) { 
-
-              $array->[DATA] =~ s/LOGIN.*/LOGIN XXXXXXXX XXXXXXXX/i ;
-	}
-
-	push @{$self->{"History"}{$count}}, $array;
-
-      if ( $array->[DATA] =~ /^\d+\s+(BAD|NO)\s/im ) {
-              $self->LastError("$array->[DATA]") ;
-              $@ = $array->[DATA];
-              carp "$array->[DATA]" if $^W ;
-	}
-	return $self;
-}
-
-#_send_line writes to the socket:
-sub _send_line {
-	my($self,$string,$suppress) = (shift, shift, shift);
-
-	#$self->_debug("_send_line: Connection state = " . 
-	#		$self->State . " and socket fh = " . 
-	#		($self->Socket||"undef") . "\n")
-	#if $self->Debug;
-
-	unless ($self->IsConnected and $self->Socket) {
-		$self->LastError("NO Not connected.\n");
-		carp "Not connected" if $^W;
-		return undef;
-	}
-
-	unless ($string =~ /\x0d\x0a$/ or $suppress ) {
-
-		chomp $string;
-		$string .= "\x0d" unless $string =~ /\x0d$/;	
-		$string .= "\x0a" ;
-	}
-	if ( 
-		$string =~ /^[^\x0a{]*\{(\d+)\}\x0d\x0a/ 	   # ;-}
-	) 	{
-		my($p1,$p2,$len) ;
-		if ( ($p1,$len)   = 
-			$string =~ /^([^\x0a{]*\{(\d+)\}\x0d\x0a)/ # } for vi
-			and  (
-				$len < 32766 ? 
-				( ($p2) = $string =~ /
-					^[^\x0a{]*
-					\{\d+\}
-					\x0d\x0a
-					(
-						.{$len}
-						.*\x0d\x0a
-					)
-				/x ) :
-
-				( ($p2) = $string =~ /	^[^\x0a{]*
-							\{\d+\}
-							\x0d\x0a
-							(.*\x0d\x0a)
-						    /x 	
-				   and length($p2) == $len  ) # }} for vi
-		     )
-		) {
-			$self->_debug("Sending literal string " .
-				"in two parts: $p1\n\tthen: $p2\n");
-			$self->_send_line($p1) or return undef;
-			$output = $self->_read_line or return undef;
-			foreach my $o (@$output) {
-				# $o is already an array ref:
-				$self->_record($self->Count,$o);              
-                              ($code) = $o->[DATA] =~ /(^\+|NO|BAD)/i;
-                              if ($o->[DATA] =~ /^\*\s+BYE/) {
-					$self->State(Unconnected);
-					close $fh;
-					return undef ;
-                              } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-					close $fh;
-					return undef;
-				}
-			}
-			if ( $code eq '+' ) 	{ $string = $p2; } 
-			else 			{ return undef ; }
-		}
-		
-	}
-	if ($self->Debug) {
-		my $dstring = $string;
-		if ( $dstring =~ m[\d+\s+Login\s+]i) {
-			$dstring =~ 
-			  s(\b(?:\Q$self->{Password}\E|\Q$self->{User}\E)\b)
-			('X' x length($self->{Password}))eg;
-		}
-		_debug $self, "Sending: $dstring\n" if $self->Debug;
-	}
-	my $total = 0;
-	my $temperrs = 0;
-	my $optimize = 0;
-     	my $maxwrite = 0;
-     	my $waittime = .02;
-     	my @last5writes = (1);
-	$string = $self->Prewritemethod->($self,$string) if $self->Prewritemethod;
-	_debug $self, "Sending: $string\n" if $self->Debug and $self->Prewritemethod;
-
-	until ($total >= length($string)) {
-		my $ret = 0;
-	        $!=0;
-		$ret =	syswrite(	
-					$self->Socket, 
-					$string, 
-					length($string)-$total, 
-					$total
-					);
-		$ret||=0;
-		if ($! == &EAGAIN ) {
-			if ( 	$self->{Maxtemperrors} !~ /^unlimited/i
-			    	and $temperrs++ > ($self->{Maxtemperrors}||10) 
-			) {
-				$self->LastError("Persistent '${!}' errors\n");
-				$self->_debug("Persistent '${!}' errors\n");
-				return undef;
-			}
-			$optimize = 1;
-		} else {
-			# avoid infinite loops on syswrite error
-			return undef unless(defined $ret);	 
-		}
-		# Optimization of wait time between syswrite calls
-		# only runs if syscalls run too fast and fill the 
-		# buffer causing "EAGAIN: Resource Temp. Unavail" errors. The
-		# premise is that $maxwrite will be approx. the same as 
-		# the smallest buffer between the sending and receiving side. 
-		# Waiting time between syscalls should ideally be exactly as 
-		# long as it takes the receiving side to empty that buffer, 
-		# minus a little bit to prevent it from
-		# emptying completely and wasting time in the select call.
-		if ($optimize) {
-		    $maxwrite = $ret if $maxwrite < $ret;
-		    push( @last5writes, $ret );
-		    shift( @last5writes ) if $#last5writes > 5;
-		    my $bufferavail = 0;
-		    $bufferavail += $_ for ( @last5writes );
-		    $bufferavail /= $#last5writes;
-		    # Buffer is staying pretty full; 
-		    # we should increase the wait period
-		    # to reduce transmission overhead/number of packets sent
-		    if ( $bufferavail < .4 * $maxwrite ) {
-			$waittime *= 1.3;
-
-		    # Buffer is nearly or totally empty; 
-		    # we're wasting time in select
-		    # call that could be used to send data, 
-		    # so reduce the wait period
-		    } elsif ( $bufferavail > .9 * $maxwrite ) {
-			$waittime *= .5;
-		    }
-		    $self->_debug("Output buffer full; waiting $waittime seconds for relief\n");
-		    CORE::select(undef, undef, undef, $waittime);
-		}
-		if ( defined($ret) ) {
-			$temperrs = 0  ;
-			$total += $ret ;
-		}
-	}
-	_debug $self,"Sent $total bytes\n" if $self->Debug;
-	return $total;
-}
-
-# _read_line reads from the socket. It is called by:
-# 	append	append_file	authenticate	connect		_imap_command
-#
-# It is also re-implemented in:
-#	message_to_file
-#
-# syntax: $output = $self->_readline( ( $literal_callback|undef ) , ( $output_callback|undef ) ) ;
-# 	  Both input argument are optional, but if supplied must either be a filehandle, coderef, or undef.
-#
-#	Returned argument is a reference to an array of arrays, ie: 
-#	$output = [ 
-#			[ $index, 'OUTPUT'|'LITERAL', $output_line ] ,
-#			[ $index, 'OUTPUT'|'LITERAL', $output_line ] ,
-#			... 	# etc,
-#	];
-
-sub _read_line {
-	my $self 	= shift;	
-	my $sh		= $self->Socket;
-	my $literal_callback    = shift;
-	my $output_callback = shift;
-	
-	unless ($self->IsConnected and $self->Socket) {
-		$self->LastError("NO Not connected.\n");
-		carp "Not connected" if $^W;
-		return undef;
-	}
-
-	my $iBuffer	= ""; 
-	my $oBuffer	= [];
-	my $count	= 0;
-	my $index	= $self->_next_index($self->Transaction);
-	my $rvec 	= my $ready = my $errors = 0; 
-	my $timeout	= $self->Timeout;
-
-	my $readlen 	= 1;
-	my $fast_io	= $self->Fast_io;	# Remember setting to reduce future method calls
-
-	if ( $fast_io ) {
-		
-		# set fcntl if necessary:
-		exists $self->{_fcntl} or $self->Fast_io($fast_io);
-		$readlen = $self->{Buffer}||4096;
-	}
-	until (	
-		# there's stuff in output buffer:
-		scalar(@$oBuffer)	and 			
-
-		# the last thing there has cr-lf:
-                $oBuffer->[-1][DATA] =~ /\x0d\x0a$/  and     
-
-		# that thing is an output line:
-                $oBuffer->[-1][TYPE]    eq "OUTPUT"  and     
-
-		# and the input buffer has been MT'ed:
-		$iBuffer		eq "" 		
-
-	) {
-              my $transno = $self->Transaction;  # used below in several places
-		if ($timeout) {
-			vec($rvec, fileno($self->Socket), 1) = 1;
-			my @ready = $self->{_select}->can_read($timeout) ;
-			unless ( @ready ) {
-				$self->LastError("Tag $transno: " .
-					"Timeout after $timeout seconds " .
-					"waiting for data from server\n");	
-				$self->_record($transno,
-					[	$self->_next_index($transno),
-						"ERROR",
-						"$transno * NO Timeout after ".
-						"$timeout seconds " .
-						"during read from " .
-						"server\x0d\x0a"
-					]
-				);
-				$self->LastError(
-					"Timeout after $timeout seconds " .
-					"during read from server\x0d\x0a"
-				);
-				return undef;
-			}
-		}
-		
-		local($^W) = undef;	# Now quiet down warnings
-
-		# read "$readlen" bytes (or less):
-              # need to check return code from $self->_sysread 
-  	      #	in case other end has shut down!!!
-              my $ret = $self->_sysread( $sh, \$iBuffer, $readlen, length($iBuffer)) ;
-	      # $self->_debug("Read so far: $iBuffer<<END>>\n");
-              if($timeout and ! defined($ret)) { # Blocking read error...
-                  my $msg = "Error while reading data from server: $!\x0d\x0a";
-                  $self->_record($transno,
-                                 [ $self->_next_index($transno),
-                                   "ERROR", "$transno * NO $msg "
-                                   ]);
-                  $@ = "$msg";
-                  return undef;
-              }
-              elsif(defined($ret) and $ret == 0) {    # Caught EOF...
-                  my $msg="Socket closed while reading data from server.\x0d\x0a";
-                  $self->_record($transno,
-                                 [ $self->_next_index($transno),
-                                   "ERROR", "$transno * NO $msg "
-                                   ]);
-                  $@ = "$msg";
-                  return undef;
-              }
-              # successfully wrote to other end, keep going...
-              $count += $ret if defined($ret);
-		LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) {
-		   my $current_line = $1;
-
-		   # $self->_debug("BUFFER: pulled from buffer: <BEGIN>${current_line}<END>\n" .
-		   # 	"and left with buffer contents of: <BEGIN>${iBuffer}<END>\n");
-
-		   LITERAL: if ($current_line =~ s/\{(\d+)\}\x0d\x0a$//) {
-			# This part handles IMAP "Literals", 
-			# which according to rfc2060 look something like this:
-			# [tag]|* BLAH BLAH {nnn}\r\n
-			# [nnn bytes of literally transmitted stuff]
-			# [part of line that follows literal data]\r\n
-
-			# Set $len to be length of impending literal:
-			my $len = $1 ;
-			
-			$self->_debug("LITERAL: received literal in line ".
-				"$current_line of length $len; ".
-				"attempting to ".
-				"retrieve from the " . length($iBuffer) . 
-				" bytes in: $iBuffer<END_OF_iBuffer>\n");
-
-			# Xfer up to $len bytes from front of $iBuffer to $litstring: 
-			my $litstring = substr($iBuffer, 0, $len);
-			$iBuffer = substr($iBuffer, length($litstring), 
-					length($iBuffer) - length($litstring) ) ;
-
-			# Figure out what's left to read (i.e. what part of 
-			# literal wasn't in buffer):
-			my $remainder_count = $len - length($litstring);
-			my $callback_value = "";
-
-			if ( defined($literal_callback) ) 	{	
-				if 	( $literal_callback =~ /GLOB/) 	{	
-					print $literal_callback $litstring ;
-					$litstring = "";
-				} elsif ($literal_callback =~ /CODE/ ) {
-					# Don't do a thing
-
-				} else 	{
-					$self->LastError(
-						ref($literal_callback) . 
-						" is an invalid callback type; " .
-						"must be a filehandle or coderef\n"
-					); 
-				}
-
-		
-			}
-			if ($remainder_count > 0 and $timeout) {
-				# If we're doing timeouts then here we set up select 
-				# and wait for data from the the IMAP socket.
-				vec($rvec, fileno($self->Socket), 1) = 1;
-				unless ( CORE::select( $ready = $rvec, 
-							undef, 
-							$errors = $rvec, 
-							$timeout) 
-				) {	
-					# Select failed; that means bad news. 
-					# Better tell someone.
-					$self->LastError("Tag " . $transno . 
-						": Timeout waiting for literal data " .
-						"from server\n");	
-					carp "Tag " . $transno . 
-						": Timeout waiting for literal data " .
-						"from server\n"
-						if $self->Debug or $^W;	
-					return undef;
-				}	
-			} 
-			
-			fcntl($sh, F_SETFL, $self->{_fcntl}) 
-				if $fast_io and defined($self->{_fcntl});
-			while ( $remainder_count > 0 ) {	   # As long as not done,
-				$self->_debug("Still need $remainder_count to " .
-					"complete literal string\n");
-				my $ret	= $self->_sysread(   	   # bytes read
-						$sh, 		   # IMAP handle 
-						\$litstring,	   # place to read into
-						$remainder_count,  # bytes left to read
-						length($litstring) # offset to read into
-				) ;
-				$self->_debug("Received ret=$ret and buffer = " .
-				"\n$litstring<END>\nwhile processing LITERAL\n");
-				if ( $timeout and !defined($ret)) { # possible timeout
-					$self->_record($transno, [ 
-						$self->_next_index($transno),
-						"ERROR",
-						"$transno * NO Error reading data " .
-						"from server: $!\n"
-						]
-					);
-					return undef;
-				} elsif ( $ret == 0 and eof($sh) ) {
-					$self->_record($transno, [ 
-						$self->_next_index($transno),
-						"ERROR",
-						"$transno * ".
-						"BYE Server unexpectedly " .
-						"closed connection: $!\n"	
-						]
-					);
-					$self->State(Unconnected);
-					return undef;
-				}
-				# decrement remaining bytes by amt read:
-				$remainder_count -= $ret;	   
-
-				if ( length($litstring) > $len ) {
-                                    # copy the extra struff into the iBuffer:
-                                    $iBuffer = substr(
-                                        $litstring,   
-                                        $len, 
-                                        length($litstring) - $len 
-                                    );
-                                    $litstring = substr($litstring, 0, $len) ;
-                                }
-
-				if ( defined($literal_callback) ) {
-					if ( $literal_callback =~ /GLOB/ ) {
-						print $literal_callback $litstring;
-						$litstring = "";
-					} 
-				}
-
-			}
-			$literal_callback->($litstring) 
-				if defined($litstring) and 
-				$literal_callback =~ /CODE/;
-
-			$self->Fast_io($fast_io) if $fast_io;
-
-		# Now let's make sure there are no IMAP server output lines 
-		# (i.e. [tag|*] BAD|NO|OK Text) embedded in the literal string
-		# (There shouldn't be but I've seen it done!), but only if
-		# EnableServerResponseInLiteral is set to true
-
-			my $embedded_output = 0;
-			my $lastline = ( split(/\x0d?\x0a/,$litstring))[-1] 
-				if $litstring;
-
-			if ( 	$self->EnableServerResponseInLiteral and
-				$lastline and 
-				$lastline =~ /^(?:\*|(\d+))\s(BAD|NO|OK)/i 
-			) {
-			  $litstring =~ s/\Q$lastline\E\x0d?\x0a//;
-			  $embedded_output++;
-
-			  $self->_debug("Got server output mixed in " .
-					"with literal: $lastline\n"
-			  ) 	if $self->Debug;
-
-			}
-		  	# Finally, we need to stuff the literal onto the 
-			# end of the oBuffer:
-			push @$oBuffer, [ $index++, "OUTPUT" , $current_line],
-					[ $index++, "LITERAL", $litstring   ];
-			push @$oBuffer,	[ $index++, "OUTPUT",  $lastline    ] 
-					if $embedded_output;
-
-		  } else { 
-			push @$oBuffer, [ $index++, "OUTPUT" , $current_line ]; 
-		  }
-		
-		}
-		#$self->_debug("iBuffer is now: $iBuffer<<END OF BUFFER>>\n");
-	}
-	#	_debug $self, "Buffer is now $buffer\n";
-      _debug $self, "Read: " . join("",map {$_->[DATA]} @$oBuffer) ."\n" 
-		if $self->Debug;
-	return scalar(@$oBuffer) ? $oBuffer : undef ;
-}
-
-sub _sysread {
-	my $self = shift @_;
-	if ( exists $self->{Readmethod} )  {
-		return $self->Readmethod->($self,@_) ;
-	} else {
-		my($handle,$buffer,$count,$offset) = @_;
-		return sysread( $handle, $$buffer, $count, $offset);
-	}
-}
-
-=begin obsolete
-
-sub old_read_line {
-	my $self 	= shift;	
-	my $sh		= $self->Socket;
-	my $literal_callback    = shift;
-	my $output_callback = shift;
-	
-	unless ($self->IsConnected and $self->Socket) {
-		$self->LastError("NO Not connected.\n");
-		carp "Not connected" if $^W;
-		return undef;
-	}
-
-	my $iBuffer	= ""; 
-	my $oBuffer	= [];
-	my $count	= 0;
-	my $index	= $self->_next_index($self->Transaction);
-	my $rvec 	= my $ready = my $errors = 0; 
-	my $timeout	= $self->Timeout;
-
-	my $readlen 	= 1;
-	my $fast_io	= $self->Fast_io;	# Remember setting to reduce future method calls
-
-	if ( $fast_io ) {
-		
-		# set fcntl if necessary:
-		exists $self->{_fcntl} or $self->Fast_io($fast_io);
-		$readlen = $self->{Buffer}||4096;
-	}
-	until (	
-		# there's stuff in output buffer:
-		scalar(@$oBuffer)	and 			
-
-		# the last thing there has cr-lf:
-                $oBuffer->[-1][DATA] =~ /\x0d\x0a$/  and     
-
-		# that thing is an output line:
-                $oBuffer->[-1][TYPE]    eq "OUTPUT"  and     
-
-		# and the input buffer has been MT'ed:
-		$iBuffer		eq "" 		
-
-	) {
-              my $transno = $self->Transaction;  # used below in several places
-		if ($timeout) {
-			vec($rvec, fileno($self->Socket), 1) = 1;
-			my @ready = $self->{_select}->can_read($timeout) ;
-			unless ( @ready ) {
-				$self->LastError("Tag $transno: " .
-					"Timeout after $timeout seconds " .
-					"waiting for data from server\n");	
-				$self->_record($transno,
-					[	$self->_next_index($transno),
-						"ERROR",
-						"$transno * NO Timeout after ".
-						"$timeout seconds " .
-						"during read from " .
-						"server\x0d\x0a"
-					]
-				);
-				$self->LastError(
-					"Timeout after $timeout seconds " .
-					"during read from server\x0d\x0a"
-				);
-				return undef;
-			}
-		}
-		
-		local($^W) = undef;	# Now quiet down warnings
-
-		# read "$readlen" bytes (or less):
-              # need to check return code from sysread in case other end has shut down!!!
-              my $ret = sysread( $sh, $iBuffer, $readlen, length($iBuffer)) ;
-		# $self->_debug("Read so far: $iBuffer<<END>>\n");
-              if($timeout and ! defined($ret)) { # Blocking read error...
-                  my $msg = "Error while reading data from server: $!\x0d\x0a";
-                  $self->_record($transno,
-                                 [ $self->_next_index($transno),
-                                   "ERROR", "$transno * NO $msg "
-                                   ]);
-                  $@ = "$msg";
-                  return undef;
-              }
-              elsif(defined($ret) and $ret == 0) {    # Caught EOF...
-                  my $msg="Socket closed while reading data from server.\x0d\x0a";
-                  $self->_record($transno,
-                                 [ $self->_next_index($transno),
-                                   "ERROR", "$transno * NO $msg "
-                                   ]);
-                  $@ = "$msg";
-                  return undef;
-              }
-              # successfully wrote to other end, keep going...
-              $count += $ret;
-		LINES: while ( $iBuffer =~ s/^(.*?\x0d?\x0a)// ) {
-		   my $current_line = $1;
-
-		   # $self->_debug("BUFFER: pulled from buffer: <BEGIN>${current_line}<END>\n" .
-		   # 	"and left with buffer contents of: <BEGIN>${iBuffer}<END>\n");
-
-		   LITERAL: if ($current_line =~ s/\{(\d+)\}\x0d\x0a$//) {
-			# This part handles IMAP "Literals", which according to rfc2060 look something like this:
-			# [tag]|* BLAH BLAH {nnn}\r\n
-			# [nnn bytes of literally transmitted stuff]
-			# [part of line that follows literal data]\r\n
-
-			# Set $len to be length of impending literal:
-			my $len = $1 ;
-			
-			$self->_debug("LITERAL: received literal in line $current_line of length $len; ".
-			"attempting to ".
-			"retrieve from the " . length($iBuffer) . " bytes in: $iBuffer<END_OF_iBuffer>\n");
-
-			# Transfer up to $len bytes from front of $iBuffer to $litstring: 
-			my $litstring = substr($iBuffer, 0, $len);
-			$iBuffer = substr($iBuffer, length($litstring), length($iBuffer) - length($litstring) ) ;
-
-			# Figure out what's left to read (i.e. what part of literal wasn't in buffer):
-			my $remainder_count = $len - length($litstring);
-			my $callback_value = "";
-
-			if ( defined($literal_callback) ) 	{	
-				if 	( $literal_callback =~ /GLOB/) 	{	
-					print $literal_callback $litstring ;
-					$litstring = "";
-				} elsif ($literal_callback =~ /CODE/ ) {
-					# Don't do a thing
-
-				} else 	{
-					$self->LastError(
-						ref($literal_callback) . 
-						" is an invalid callback type; must be a filehandle or coderef"
-					); 
-				}
-
-		
-			}
-			if ($remainder_count > 0 and $timeout) {
-				# If we're doing timeouts then here we set up select and wait for data from the
-				# the IMAP socket.
-				vec($rvec, fileno($self->Socket), 1) = 1;
-				unless ( CORE::select( $ready = $rvec, 
-							undef, 
-							$errors = $rvec, 
-							$timeout) 
-				) {	
-					# Select failed; that means bad news. 
-					# Better tell someone.
-					$self->LastError("Tag " . $transno . 
-						": Timeout waiting for literal data " .
-						"from server\n");	
-					carp "Tag " . $transno . 
-						": Timeout waiting for literal data " .
-						"from server\n"
-						if $self->Debug or $^W;	
-					return undef;
-				}	
-			} 
-			
-			fcntl($sh, F_SETFL, $self->{_fcntl}) 
-				if $fast_io and defined($self->{_fcntl});
-			while ( $remainder_count > 0 ) {	   # As long as not done,
-
-				my $ret	= sysread(	   	   # bytes read
-						$sh, 		   # IMAP handle 
-						$litstring,	   # place to read into
-						$remainder_count,  # bytes left to read
-						length($litstring) # offset to read into
-				) ;
-				if ( $timeout and !defined($ret)) { # possible timeout
-					$self->_record($transno, [ 
-						$self->_next_index($transno),
-						"ERROR",
-						"$transno * NO Error reading data " .
-						"from server: $!\n"
-						]
-					);
-					return undef;
-				} elsif ( $ret == 0 and eof($sh) ) {
-					$self->_record($transno, [ 
-						$self->_next_index($transno),
-						"ERROR",
-						"$transno * ".
-						"BYE Server unexpectedly " .
-						"closed connection: $!\n"	
-						]
-					);
-					$self->State(Unconnected);
-					return undef;
-				}
-				# decrement remaining bytes by amt read:
-				$remainder_count -= $ret;	   
-
-				if ( defined($literal_callback) ) {
-					if ( $literal_callback =~ /GLOB/ ) {
-						print $literal_callback $litstring;
-						$litstring = "";
-					} 
-				}
-
-			}
-			$literal_callback->($litstring) 
-				if defined($litstring) and 
-				$literal_callback =~ /CODE/;
-
-			$self->Fast_io($fast_io) if $fast_io;
-
-		# Now let's make sure there are no IMAP server output lines 
-		# (i.e. [tag|*] BAD|NO|OK Text) embedded in the literal string
-		# (There shouldn't be but I've seen it done!), but only if
-		# EnableServerResponseInLiteral is set to true
-
-			my $embedded_output = 0;
-			my $lastline = ( split(/\x0d?\x0a/,$litstring))[-1] 
-				if $litstring;
-
-			if ( 	$self->EnableServerResponseInLiteral and
-				$lastline and 
-				$lastline =~ /^(?:\*|(\d+))\s(BAD|NO|OK)/i 
-			) {
-			  $litstring =~ s/\Q$lastline\E\x0d?\x0a//;
-			  $embedded_output++;
-
-			  $self->_debug("Got server output mixed in " .
-					"with literal: $lastline\n"
-			  ) 	if $self->Debug;
-
-			}
-		  	# Finally, we need to stuff the literal onto the 
-			# end of the oBuffer:
-			push @$oBuffer, [ $index++, "OUTPUT" , $current_line],
-					[ $index++, "LITERAL", $litstring   ];
-			push @$oBuffer,	[ $index++, "OUTPUT",  $lastline    ] 
-					if $embedded_output;
-
-		  } else { 
-			push @$oBuffer, [ $index++, "OUTPUT" , $current_line ]; 
-		  }
-		
-		}
-		#$self->_debug("iBuffer is now: $iBuffer<<END OF BUFFER>>\n");
-	}
-	#	_debug $self, "Buffer is now $buffer\n";
-      _debug $self, "Read: " . join("",map {$_->[DATA]} @$oBuffer) ."\n" 
-		if $self->Debug;
-	return scalar(@$oBuffer) ? $oBuffer : undef ;
-}
-
-=end obsolete
-
-=cut
-
-
-sub Report {
-	my $self = shift;
-#	$self->_debug( "Dumper: " . Data::Dumper::Dumper($self) . 
-#			"\nReporting on following keys: " . join(", ",keys %{$self->{'History'}}). "\n");
-	return 	map { 
-                      map { $_->[DATA] } @{$self->{"History"}{$_}} 
-	}		sort { $a <=> $b } keys %{$self->{"History"}}
-	;
-}
-
-
-sub Results {
-	my $self 	= shift	;
-	my $transaction = shift||$self->Count;
-	
-	return wantarray 							? 
-              map {$_->[DATA] }       @{$self->{"History"}{$transaction}}     : 
-              [ map {$_->[DATA] }     @{$self->{"History"}{$transaction}} ]   ;
-}
-
-
-sub LastIMAPCommand {
-      my @a = map { $_->[DATA] } @{$_[0]->{"History"}{$_[1]||$_[0]->Transaction}};
-	return shift @a;
-}
-
-
-sub History {
-      my @a = map { $_->[DATA] } @{$_[0]->{"History"}{$_[1]||$_[0]->Transaction}};
-	shift @a;
-	return wantarray ? @a : \@a ;
-
-}
-
-sub Escaped_results {
-	my @a;
-	foreach  my $line (@{$_[0]->{"History"}{$_[1]||$_[0]->Transaction}} ) {
-		if (  defined($line) and $_[0]->_is_literal($line) ) { 
-			$line->[DATA] =~ s/([\\\(\)"\x0d\x0a])/\\$1/g ;
-			push @a, qq("$line->[DATA]");
-		} else {
-      			push @a, $line->[DATA] ;
-		}
-	}
-	# $a[0] is the ALWAYS the command ; I make sure of that in _imap_command
-	shift @a;	
-	return wantarray ? @a : \@a ;
-}
-
-sub Unescape {
-	shift @_ if $_[1];
-	my $whatever = shift;
-	$whatever =~ s/\\([\\\(\)"\x0d\x0a])/$1/g if defined $whatever;
-	return $whatever;
-}
-
-sub logout {
-	my $self = shift;
-	my $string = "LOGOUT";
-	$self->_imap_command($string) ; 
-	$self->{Folders} = undef;
-	$self->{_IMAP4REV1} = undef;
-	eval {$self->Socket->close if defined($self->Socket)} ; 
-	$self->{Socket} = undef;
-	$self->State(Unconnected);
-	return $self;
-}
-
-sub folders {
-        my $self = shift;
-	my $what = shift ;
-        return wantarray ?      @{$self->{Folders}} :
-                                $self->{Folders} 
-                if ref($self->{Folders}) and !$what;
-	
-        my @folders ;  
-	my @list = $self->list(undef,( $what? "$what" . $self->separator($what) . "*" : undef ) );
-	push @list, $self->list(undef, $what) if $what and $self->exists($what) ;
-	# my @list = 
-	# foreach (@list) { $self->_debug("Pushing $_\n"); }
-	my $m;
-
-	for ($m = 0; $m < scalar(@list); $m++ ) {
-		# $self->_debug("Folders: examining $list[$m]\n");
-
-		if ($list[$m] && $list[$m]  !~ /\x0d\x0a$/ ) {
-			$self->_debug("folders: concatenating $list[$m] and " . $list[$m+1] . "\n") ;
-			$list[$m] .= $list[$m+1] ;
-			$list[$m+1] = "";	
-			$list[$m] .= "\x0d\x0a" unless $list[$m] =~ /\x0d\x0a$/;
-		}
-			
-		
-
-		push @folders, $1||$2 
-			if $list[$m] =~
-                        /       ^\*\s+LIST               # * LIST
-                                \s+\([^\)]*\)\s+         # (Flags)
-                                (?:"[^"]*"|NIL)\s+	 # "delimiter" or NIL
-                                (?:"([^"]*)"|(.*))\x0d\x0a$  # Name or "Folder name"
-                        /ix;
-		$folders[-1] = '"' . $folders[-1] . '"' 
-			if $1 and !$self->exists($folders[-1]) ;
-		# $self->_debug("folders: line $list[$m]: 1=$1 and 2=$2\n");
-        } 
-
-        # for my $f (@folders) { $f =~ s/^\\FOLDER LITERAL:://;}
-	my @clean = (); my %memory = ();
-	foreach my $f (@folders) { push @clean, $f unless $memory{$f}++ }
-        $self->{Folders} = \@clean unless $what;
-
-        return wantarray ? @clean : \@clean ;
-}
-
-
-sub exists {
-	my ($self,$what) = (shift,shift);
-	return $self if $self->STATUS($self->Massage($what),"(MESSAGES)");
-	return undef;
-}
-
-# Updated to handle embedded literal strings
-sub get_bodystructure {
-	my($self,$msg) = @_;
-	unless ( eval {require Mail::IMAPClient::BodyStructure ; 1 } ) {
-		$self->LastError("Unable to use get_bodystructure: $@\n");
-		return undef;
-	}
-	my @out = $self->fetch($msg,"BODYSTRUCTURE");
-	my $bs = "";
-	my $output = grep(	
-		/BODYSTRUCTURE \(/i,  @out	 # Wee! ;-)
-	); 
-	if ( $output =~ /\r\n$/ ) {
-		eval { $bs = Mail::IMAPClient::BodyStructure->new( $output )};  
-	} else {
-		$self->_debug("get_bodystructure: reassembling original response\n");
-		my $start = 0;
-		foreach my $o (@{$self->{"History"}{$self->Transaction}}) {
-			next unless $self->_is_output_or_literal($o);
-			$self->_debug("o->[DATA] is ".$o->[DATA]."\n");
-			next unless $start or 
-				$o->[DATA] =~ /BODYSTRUCTURE \(/i and ++$start;	  # Hi, vi! ;-)
-			if ( length($output) and $self->_is_literal($o) ) {
-				my $data = $o->[DATA];
-				$data =~ s/"/\\"/g;
-				$data =~ s/\(/\\\(/g;
-				$data =~ s/\)/\\\)/g;
-				$output .= '"'.$data.'"';
-			} else {
-				$output .= $o->[DATA] ;
-			}
-			$self->_debug("get_bodystructure: reassembled output=$output<END>\n");
-		}
-		eval { $bs = Mail::IMAPClient::BodyStructure->new( $output )};  
-	}
-	$self->_debug("get_bodystructure: msg $msg returns this ref: ". 
-		( $bs ? " $bs" : " UNDEF" ) 
-		."\n");
-	return $bs;
-}
-
-# Updated to handle embedded literal strings 
-sub get_envelope {
-	my($self,$msg) = @_;
-	unless ( eval {require Mail::IMAPClient::BodyStructure ; 1 } ) {
-		$self->LastError("Unable to use get_envelope: $@\n");
-		return undef;
-	}
-	my @out = $self->fetch($msg,"ENVELOPE");
-	my $bs = "";
-	my $output = grep(	
-		/ENVELOPE \(/i,  @out	 # Wee! ;-)
-	); 
-	if ( $output =~ /\r\n$/ ) {
-		eval { 
-		 $bs = Mail::IMAPClient::BodyStructure::Envelope->new($output)
-		};
-	} else {
-		$self->_debug("get_envelope: " .
-			"reassembling original response\n");
-		my $start = 0;
-		foreach my $o (@{$self->{"History"}{$self->Transaction}}) {
-			next unless $self->_is_output_or_literal($o);
-			$self->_debug("o->[DATA] is ".$o->[DATA]."\n");
-			next unless $start or 
-				$o->[DATA] =~ /ENVELOPE \(/i and ++$start;
-				# Hi, vi! ;-)
-			if ( length($output) and $self->_is_literal($o) ) {
-				my $data = $o->[DATA];
-				$data =~ s/"/\\"/g;
-				$data =~ s/\(/\\\(/g;
-				$data =~ s/\)/\\\)/g;
-				$output .= '"'.$data.'"';
-			} else {
-				$output .= $o->[DATA] ;
-			}
-			$self->_debug("get_envelope: " .
-				"reassembled output=$output<END>\n");
-		}
-		eval { 
-		  $bs=Mail::IMAPClient::BodyStructure::Envelope->new($output)
-		};  
-	}
-	$self->_debug("get_envelope: msg $msg returns this ref: ". 
-		( $bs ? " $bs" : " UNDEF" ) 
-		."\n");
-	return $bs;
-}
-
-=begin obsolete
-
-sub old_get_envelope {
-	my($self,$msg) = @_;
-	unless ( eval {require Mail::IMAPClient::BodyStructure ; 1 } ) {
-		$self->LastError("Unable to use get_envelope: $@\n");
-		return undef;
-	}
-	my $bs = "";
-	my @out = $self->fetch($msg,"ENVELOPE");
-	my $output = grep(	
-		/ENVELOPE \(/i,  @out	 # Wee! ;-)
-	); 
-	if ( $output =~ /\r\n$/ ) {
-		eval { $bs = Mail::IMAPClient::BodyStructure::Envelope->new( $output )};  
-	} else {
-		$self->_debug("get_envelope: reassembling original response\n");
-		my $start = 0;
-		foreach my $o (@{$self->{"History"}{$self->Transaction}}) {
-			next unless $self->_is_output_or_literal($o);
-			$self->_debug("o->[DATA] is ".$o->[DATA]."\n");
-			next unless $start or 
-				$o->[DATA] =~ /ENVELOPE \(/i and ++$start;	  # Hi, vi! ;-)
-			if ( length($output) and $self->_is_literal($o) ) {
-				my $data = $o->[DATA];
-				$data =~ s/"/\\"/g;
-				$data =~ s/\(/\\\(/g;
-				$data =~ s/\)/\\\)/g;
-				$output .= '"'.$data.'"';
-			} else {
-				$output .= $o->[DATA] ;
-			}
-		}
-		$self->_debug("get_envelope: reassembled output=$output<END>\n");
-		eval { $bs = Mail::IMAPClient::BodyStructure->new( $output )};  
-	}
-	$self->_debug("get_envelope: msg $msg returns this ref: ". 
-		( $bs ? " $bs" : " UNDEF" ) 
-		."\n");
-	return $bs;
-}
-
-=end obsolete
-
-=cut
-
-
-sub fetch {
-
-	my $self = shift;
-	my $what = shift||"ALL";
-	#ref($what) and $what = join(",",@$what);	
-	if ( $what eq 'ALL' ) {
-		$what = $self->Range($self->messages );
-	} elsif (ref($what) or $what =~ /^[,:\d]+\w*$/)  {
-		$what = $self->Range($what);	
-	}
-	$self->_imap_command( ( $self->Uid ? "UID " : "" ) .
-				"FETCH $what" . ( @_ ? " " . join(" ",@_) : '' )
-	) 	 					or return undef;
-	return wantarray ? 	$self->History($self->Count) 	: 
-                              [ map { $_->[DATA] } @{$self->{'History'}{$self->Count}} ];
-
-}
-
-
-sub fetch_hash {
-	my $self = shift;
-	my $hash = ref($_[-1]) ? pop @_ : {};
-	my @words = @_;
-	for (@words) { 
-		s/([\( ])FAST([\) ])/${1}FLAGS INTERNALDATE RFC822\.SIZE$2/i  ;
-		s/([\( ])FULL([\) ])/${1}FLAGS INTERNALDATE RFC822\.SIZE ENVELOPE BODY$2/i  ;
-	}
-	my $msgref = scalar($self->messages);
-	my $output = scalar($self->fetch($msgref,"(" . join(" ",@_) . ")")) 
-	; #	unless grep(/\b(?:FAST|FULL)\b/i,@words);
-	my $x;
-	for ($x = 0;  $x <= $#$output ; $x++) {
-		my $entry = {};
-		my $l = $output->[$x];
-		if ($self->Uid) {	
-			my($uid) = $l =~ /\((?:.* )?UID (\d+).*\)/i;
-			next unless $uid;
-			if ( exists $hash->{$uid} ) {
-				$entry = $hash->{$uid} ;
-			} else {
-				$hash->{$uid} ||= $entry;
-			}
-		} else {
-			my($mid) = $l =~ /^\* (\d+) FETCH/i;
-			next unless $mid;
-			if ( exists $hash->{$mid} ) {
-				$entry = $hash->{$mid} ;
-			} else {
-				$hash->{$mid} ||= $entry;
-			}
-		}
-			
-		foreach my $w (@words) {
-		   if ( $l =~ /\Q$w\E\s*$/i ) {
-			$entry->{$w} = $output->[$x+1];
-			$entry->{$w} =~ s/(?:\x0a?\x0d)+$//g;
-			chomp $entry->{$w};
-		   } else {
-			$l =~ /\( 	    # open paren followed by ... 
-				(?:.*\s)?   # ...optional stuff and a space
-				\Q$w\E\s    # escaped fetch field<sp>
-				(?:"	    # then: a dbl-quote
-				  (\\.|   # then bslashed anychar(s) or ...
-				   [^"]+)   # ... nonquote char(s)
-				"|	    # then closing quote; or ...
-				\(	    # ...an open paren
-				  (\\.|     # then bslashed anychar or ...
-				   [^\)]+)  # ... non-close-paren char
-				\)|	    # then closing paren; or ...
-				(\S+))	    # unquoted string
-				(?:\s.*)?   # possibly followed by space-stuff
-				\)	    # close paren
-			/xi;
-			$entry->{$w}=defined($1)?$1:defined($2)?$2:$3;
-		   }
-		}
-	}
-	return wantarray ? %$hash : $hash;
-}
-sub AUTOLOAD {
-
-	my $self = shift;
-	return undef if $Mail::IMAPClient::AUTOLOAD =~ /DESTROY$/;
-	delete $self->{Folders}  ;
-	my $autoload = $Mail::IMAPClient::AUTOLOAD;
-	$autoload =~ s/.*:://;
-	if (	
-			$^W
-		and	$autoload =~ /^[a-z]+$/
-		and	$autoload !~ 
-				/^	(?:
-						store	 |
-						copy	 |
-						subscribe|
-						create	 |
-						delete	 |
-						close	 |
-						expunge
-					)$
-				/x 
-	) {
-		carp 	"$autoload is all lower-case. " .
-			"May conflict with future methods. " .
-			"Change method name to be mixed case or all upper case to ensure " .
-			"upward compatability"
-	}
-	if (scalar(@_)) {
-		my @a = @_;
-		if (	
-			$autoload =~ 
-				/^(?:subscribe|delete|myrights)$/i
-		) {
-			$a[-1] = $self->Massage($a[-1]) ;
-		} elsif (	
-			$autoload =~ 
-				/^(?:create)$/i
-		) {
-			$a[0] = $self->Massage($a[0]) ;
-		} elsif (
-			$autoload =~ /^(?:store|copy)$/i
-		) {
-			$autoload = "UID $autoload"
-				if $self->Uid;
-		} elsif (
-			$autoload =~ /^(?:expunge)$/i and defined($_[0])
-		) {
-			my $old;
-			if ( $_[0] ne $self->Folder ) {
-				$old = $self->Folder; $self->select($_[0]); 
-			} 	
-			my $succ = $self->_imap_command(qq/$autoload/) ;
-			$self->select($old);
-			return undef unless $succ;
-			return wantarray ? 	$self->History($self->Count) 	: 
-                                              map {$_->[DATA]}@{$self->{'History'}{$self->Count}}     ;
-			
-		}
-		$self->_debug("Autoloading: $autoload " . ( @a ? join(" ",@a):"" ) ."\n" )
-			if $self->Debug;
-		return undef 
-			unless $self->_imap_command(
-			 	qq/$autoload/ .  ( @a ? " " . join(" ",@a) : "" )
-			)  ;
-	} else {
-		$self->Folder(undef) if $autoload =~ /^(?:close)/i ; 
-		$self->_imap_command(qq/$autoload/) or return undef;
-	}
-	return wantarray ? 	$self->History($self->Count) 	: 
-                              [map {$_->[DATA] } @{$self->{'History'}{$self->Count}}] ;
-
-}
-
-sub rename {
-    my $self = shift;
-    my ($from, $to) = @_;
-    local($_);
-    if ($from =~ /^"(.*)"$/) {
-	$from = $1 unless $self->exists($from);
-        $from =~ s/"/\\"/g;
-    }
-    if ($to =~ /^"(.*)"$/) {
-	$to = $1 unless $self->exists($from) and $from =~ /^".*"$/;
-        $to =~ s/"/\\"/g;
-    }
-    $self->_imap_command(qq(RENAME "$from" "$to")) or return undef;
-    return $self;
-}
-
-sub status {
-
-	my $self = shift;
-	my $box = shift ;  
-	return undef unless defined($box);
-	$box = $self->Massage($box);
-	my @pieces = @_;
-	$self->_imap_command("STATUS $box (". (join(" ",@_)||'MESSAGES'). ")") or return undef;
-	return wantarray ? 	$self->History($self->Count) 	: 
-                              [map{$_->[DATA]}@{$self->{'History'}{$self->Count}}];
-
-}
-
-
-# Can take a list of messages now.
-# If a single message, returns array or ref to array of flags
-# If a ref to array of messages, returns a ref to hash of msgid => flag arr
-# See parse_headers for more information
-# 2000-03-22 Adrian Smith (adrian.smith@ucpag.com)
-
-sub flags {
-	my $self = shift;
-	my $msgspec = shift;
-	my $flagset = {};
-	my $msg;
-	my $u_f = $self->Uid;
-
-	# Determine if set of messages or just one
-	if (ref($msgspec) eq 'ARRAY' ) {
-		$msg = $self->Range($msgspec) ;
-	} elsif ( !ref($msgspec) ) 	{
-		$msg = $msgspec;
-		if ( scalar(@_) ) {
-			$msgspec = $self->Range($msg) ;
-			$msgspec += $_ for (@_);
-			$msg = $msgspec;
-		}
-	} elsif ( ref($msgspec) =~ /MessageSet/ ) {
-		if ( scalar(@_) ) {
-			$msgspec += $_ for @_;
-		}
-	} else {
-		$self->LastError("Invalid argument passed to fetch.\n");
-		return undef;
-	}
-
-	# Send command
-	unless ( $self->fetch($msg,"FLAGS") ) {
-		return undef;
-	}
-
-	# Parse results, setting entry in result hash for each line
- 	foreach my $resultline ($self->Results) {
-		$self->_debug("flags: line = '$resultline'\n") ;
-		if (	$resultline =~ 
-			/\*\s+(\d+)\s+FETCH\s+	# * nnn FETCH 
-			 \(			# open-paren
-			 (?:\s?UID\s(\d+)\s?)?	# optional: UID nnn <space>
-			 FLAGS\s?\((.*)\)\s?	# FLAGS (\Flag1 \Flag2) <space>
-			 (?:\s?UID\s(\d+))?	# optional: UID nnn
-			 \) 			# close-paren
-			/x
-		) {
-			{ local($^W=0);
-			 $self->_debug("flags: line = '$resultline' " .
-			   "and 1,2,3,4 = $1,$2,$3,$4\n") 
-			 if $self->Debug;
-			}
-			my $mailid = $u_f ? ( $2||$4) : $1;
-			my $flagsString = $3 ;
-			my @flags = map { s/\s+$//; $_ } split(/\s+/, $flagsString);
-			$flagset->{$mailid} = \@flags;
-		}
-	}
-
-	# Did the guy want just one response? Return it if so
-	unless (ref($msgspec) ) {
-		my $flagsref = $flagset->{$msgspec};
-		return wantarray ? @$flagsref : $flagsref;
-	}
-
-	# Or did he want a hash from msgid to flag array?
-	return $flagset;
-}
-
-# parse_headers modified to allow second param to also be a
-# reference to a list of numbers. If this is a case, the headers
-# are read from all the specified messages, and a reference to
-# an hash of mail numbers to references to hashes, are returned.
-# I found, with a mailbox of 300 messages, this was
-# *significantly* faster against our mailserver (< 1 second
-# vs. 20 seconds)
-#
-# 2000-03-22 Adrian Smith (adrian.smith@ucpag.com)
-
-sub parse_headers {
-	my($self,$msgspec,@fields) = @_;
-	my(%fieldmap) = map { ( lc($_),$_ )  } @fields;
-	my $msg; my $string; my $field;
-
-	# Make $msg a comma separated list, of messages we want
-        if (ref($msgspec) eq 'ARRAY') {
-		#$msg = join(',', @$msgspec);
-		$msg = $self->Range($msgspec);
-	} else {
-		$msg = $msgspec;
-	}
-
-	if ($fields[0] 	=~ 	/^[Aa][Ll]{2}$/ 	) { 
-
-		$string = 	"$msg body" . 
-		# use ".peek" if Peek parameter is a) defined and true, 
-		# 	or b) undefined, but not if it's defined and untrue:
-
-		( 	defined($self->Peek) 		? 
-			( $self->Peek ? ".peek" : "" ) 	: 
-			".peek" 
-		) .  "[header]" 			; 
-
-	} else {
-		$string	= 	"$msg body" .
-		# use ".peek" if Peek parameter is a) defined and true, or 
-		# b) undefined, but not if it's defined and untrue:
-
-		( defined($self->Peek) 			? 
-			( $self->Peek ? ".peek" : "" ) 	: 
-			".peek" 
-		) .  "[header.fields ("	. join(" ",@fields) 	. ')]' ;
-	}
-
-	my @raw=$self->fetch(	$string	) or return undef;
-
-	my $headers = {};	# hash from message ids to header hash
-	my $h = 0;		# reference to hash of current msgid, or 0 between msgs
-	
-        for my $header (map { split(/(?:\x0d\x0a)/,$_) } @raw) {
-                local($^W) = undef;
-                if ( $header =~ /^\*\s+\d+\s+FETCH\s+\(.*BODY\[HEADER(?:\]|\.FIELDS)/i) {
-                        if ($self->Uid) {
-                                if ( my($msgid) = $header =~ /UID\s+(\d+)/ ) {
-                                        $h = {};
-                                        $headers->{$msgid} = $h;
-                                } else {
-                                        $h = {};
-                                }
-                        } else {
-                                if ( my($msgid) = $header =~ /^\*\s+(\d+)/ ) {
-                                        #start of new message header:
-                                        $h = {};
-                                        $headers->{$msgid} = $h;
-                                }
-                        }
-                }
-                next if $header =~ /^\s+$/;
-
-                # ( for vi
-                if ($header =~ /^\)/) {           # end of this message
-                        $h = 0;                   # set to be between messages
-                        next;
-                }
-                # check for '<optional_white_space>UID<white_space><UID_number><optional_white_space>)'
-                # when parsing headers by UID.
-                if ($self->Uid and my($msgid) = $header =~ /^\s*UID\s+(\d+)\s*\)/) {
-                        $headers->{$msgid} = $h;        # store in results against this message
-                        $h = 0;                 	# set to be between messages
-                        next;
-                }
-
-		if ($h != 0) {			  # do we expect this to be a header?
-               		my $hdr = $header;
-               		chomp $hdr;
-               		$hdr =~ s/\r$//;   
-               		if ($hdr =~ s/^(\S+):\s*//) { 
-                       		$field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
-                       		push @{$h->{$field}} , $hdr ;
-               		} elsif ($hdr =~ s/^.*FETCH\s\(.*BODY\[HEADER\.FIELDS.*\)\]\s(\S+):\s*//) { 
-                       		$field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
-                       		push @{$h->{$field}} , $hdr ;
-               		} elsif ( ref($h->{$field}) eq 'ARRAY') {
-			        
-					$hdr =~ s/^\s+/ /;
-                       			$h->{$field}[-1] .= $hdr ;
-               		}
-		}
-	}
-	my $candump = 0;
-	if ($self->Debug) {
-		eval {
-			require Data::Dumper;
-			Data::Dumper->import;
-		};
-		$candump++ unless $@;
-	}
-	# if we asked for one message, just return its hash,
-	# otherwise, return hash of numbers => header hash
-	# if (ref($msgspec) eq 'ARRAY') {
-	if (ref($msgspec) ) {
-		#_debug $self,"Structure from parse_headers:\n", 
-		#	Dumper($headers) 
-		#	if $self->Debug;
-		return $headers;
-	} else {
-		#_debug $self, "Structure from parse_headers:\n", 
-		#	Dumper($headers->{$msgspec}) 
-		#	if $self->Debug;
-		return $headers->{$msgspec};
-	}
-}
-
-sub subject { return $_[0]->get_header($_[1],"Subject") }
-sub date { return $_[0]->get_header($_[1],"Date") }
-sub rfc822_header { get_header(@_) }
-
-sub get_header {
-	my($self , $msg, $header ) = @_;
-	my $val = 0;
-	eval { $val = $self->parse_headers($msg,$header)->{$header}[0] };
-	return defined($val)? $val : undef;
-}
-
-sub recent_count {
-	my ($self, $folder) = (shift, shift);
-
-	$self->status($folder, 'RECENT') or return undef;
-
-	chomp(my $r = ( grep { s/\*\s+STATUS\s+.*\(RECENT\s+(\d+)\s*\)/$1/ }
-			$self->History($self->Transaction)
-	)[0]);
-
-	$r =~ s/\D//g;
-
-	return $r;
-}
-
-sub message_count {
-	
-	my ($self, $folder) = (shift, shift);
-	$folder ||= $self->Folder;
-	
-	$self->status($folder, 'MESSAGES') or return undef;
-        foreach my $result  (@{$self->{"History"}{$self->Transaction}}) {
-              return $1 if $result->[DATA] =~ /\(MESSAGES\s+(\d+)\s*\)/ ;
-        }
-
-	return undef;
-
-}
-
-{
-for my $datum (
-                qw(     recent seen
-                        unseen messages
-                 )
-) {
-        no strict 'refs';
-        *$datum = sub {
-		my $self = shift;
-		#my @hits;
-
-		#my $hits = $self->search($datum eq "messages" ? "ALL" : "$datum")
-		#	 or return undef;
-		#print "Received $hits from search and array context flag is ",
-		#	wantarry,"\n";
-		#if ( scalar(@$hits) ) {
-		#	return wantarray ? @$hits : $hits ;
-		#}
-		return $self->search($datum eq "messages" ? "ALL" : "$datum") ;
-
-
-        };
-}
-}
-{
-for my $datum (
-                qw(     sentbefore 	sentsince 	senton
-			since 		before 		on
-                 )
-) {
-	no strict 'refs';
-	*$datum = sub {
-
-		my($self,$time) = (shift,shift);
-
-		my @hits; my $imapdate;
-		my @mnt  =      qw{ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec};
-
-		if ( $time =~ /\d\d-\D\D\D-\d\d\d\d/ ) {
-			$imapdate = $time;
-		} elsif ( $time =~ /^\d+$/ ) {
-			my @ltime = localtime($time);
-			$imapdate = sprintf(	"%2.2d-%s-%4.4d", 
-						$ltime[3], $mnt[$ltime[4]], $ltime[5] + 1900);
-		} else {
-			$self->LastError("Invalid date format supplied to '$datum' method.");
-			return undef;
-		}
-		$self->_imap_command( ($self->Uid ? "UID " : "") . "SEARCH $datum $imapdate")
-			or return undef;
-		my @results =  $self->History($self->Count)     ;
-
-		for my $r (@results) {
-
-		       chomp $r;
-		       $r =~ s/\r$//;
-		       $r =~ s/^\*\s+SEARCH\s+//i or next;
-		       push @hits, grep(/\d/,(split(/\s+/,$r)));
-			_debug $self, "Hits are now: ",join(',',@hits),"\n" if $self->Debug;
-		}
-
-		return wantarray ? @hits : \@hits;
-	}
-}
-}
-
-sub or {
-
-	my $self = shift ;
-	my @what = @_; 
-	my @hits;
-
-	if ( scalar(@what) < 2 ) {
-		$self->LastError("Invalid number of arguments passed to or method.\n");
-		return undef;
-	}
-
-	my $or = "OR " . $self->Massage(shift @what);
-	$or .= " " . $self->Massage(shift @what);
-		
-
-	for my $w ( @what ) {
-		my $w = $self->Massage($w) ;
-		$or = "OR " . $or . " " . $w ;
-	}
-
-	$self->_imap_command( ($self->Uid ? "UID " : "") . "SEARCH $or")
-		or return undef;
-	my @results =  $self->History($self->Count)     ;
-
-	for my $r (@results) {
-
-	       chomp $r;
-	       $r =~ s/\r$//;
-	       $r =~ s/^\*\s+SEARCH\s+//i or next;
-	       push @hits, grep(/\d/,(split(/\s+/,$r)));
-		_debug $self, "Hits are now: ",join(',',@hits),"\n" 
-				if $self->Debug;
-	}
-
-	return wantarray ? @hits : \@hits;
-}
-
-#sub Strip_cr {
-#	my $self = shift;
-
-#	my $in = $_[0]||$self ;
-
-#	$in =~ s/\r//g  ;
-
-#	return $in;
-#}
-
-
-sub disconnect { $_[0]->logout }
-
-
-sub search {
-
-	my $self = shift;
-	my @hits;
-	my @a = @_;
-	$@ = "";
-	# massage?
-	$a[-1] = $self->Massage($a[-1],1) 
-		if scalar(@a) > 1 and !exists($SEARCH_KEYS{uc($a[-1])}); 
-	$self->_imap_command( ( $self->Uid ? "UID " : "" ) . "SEARCH ". join(' ',@a)) 
-			 or return undef;
-	my $results =  $self->History($self->Count) ;
-
-
-	for my $r (@$results) {
-	#$self->_debug("Considering the search result line: $r");			
-               chomp $r;
-               $r =~ s/\r\n?/ /g;
-               $r =~ s/^\*\s+SEARCH\s+(?=.*\d.*)// or next;
-               my @h = grep(/^\d+$/,(split(/\s+/,$r)));
-	       push @hits, @h if scalar(@h) ; # and grep(/\d/,@h) );
-
-	}
-
-	$self->{LastError}="Search completed successfully but found no matching messages\n"
-		unless scalar(@hits);
-
-	if ( wantarray ) {
-		return @hits;
-	} else {
-		if ($self->Ranges) {
-			#print STDERR "Fetch: Returning range\n";
-			return scalar(@hits) ? $self->Range(\@hits) : undef;
-		} else {
-			#print STDERR "Fetch: Returning ref\n";
-			return scalar(@hits) ? \@hits : undef;
-		}
-	}
-}
-
-sub thread {
-	# returns a Thread data structure
-	#
-	# $imap->thread($algorythm, $charset, @search_args);
-	my $self = shift;
-
-	my $algorythm     = shift;
-	   $algorythm   ||= $self->has_capability("THREAD=REFERENCES") ? "REFERENCES" : "ORDEREDSUBJECT";
-	my $charset 	  = shift;
-	   $charset 	||= "UTF-8";
-
-	my @a = @_;
-
-	$a[0]||="ALL" ;
-	my @hits;
-	# massage?
-
-	$a[-1] = $self->Massage($a[-1],1) 
-		if scalar(@a) > 1 and !exists($SEARCH_KEYS{uc($a[-1])}); 
-	$self->_imap_command( ( $self->Uid ? "UID " : "" ) . 
-				"THREAD $algorythm $charset " . 
-				join(' ',@a)
-	) or return undef;
-	my $results =  $self->History($self->Count) ;
-
-	my $thread = "";
-	for my $r (@$results) {
-		#$self->_debug("Considering the search result line: $r");			
-               	chomp $r;
-               	$r =~ s/\r\n?/ /g;
-               	if ( $r =~ /^\*\s+THREAD\s+/ ) {
-			eval { require "Mail/IMAPClient/Thread.pm" }
-				or ( $self->LastError($@), return undef);
-			my $parser = Mail::IMAPClient::Thread->new();
-			$thread = $parser->start($r) ;
-		} else {
-			next;
-		}
-	       	#while ( $r =~ /(\([^\)]*\))/ ) { 
-		#	push @hits, [ split(/ /,$1) ] ;
-		#}
-	}
-
-	$self->{LastError}="Thread search completed successfully but found no matching messages\n"
-		unless ref($thread);
-	return $thread ||undef;
-
-	if ( wantarray ) {
-
-		return @hits;
-	} else {
-		return scalar(@hits) ? \@hits : undef;
-	}
-}
-
-
-
-
-sub delete_message {
-
-	my $self = shift;
-	my $count = 0;
-	my @msgs = ();
-	for my $arg (@_) {
-		if (ref($arg) eq 'ARRAY') {
-			push @msgs, @{$arg};
-		} else {
-			push @msgs, split(/\,/,$arg);
-		}
-	}
-	
-
-	$self->store(join(',',@msgs),'+FLAGS.SILENT','(\Deleted)') and $count = scalar(@msgs);
-
-	return $count;
-}
-
-sub restore_message {
-
-	my $self = shift;
-	my @msgs = ();
-	for my $arg (@_) {
-		if (ref($arg) eq 'ARRAY') {
-			push @msgs, @{$arg};
-		} else {
-			push @msgs, split(/\,/,$arg);
-		}
-	}
-	
-
-	$self->store(join(',',@msgs),'-FLAGS','(\Deleted)') ;
-	my $count = grep(
-			/
-				^\*			# Start with an asterisk
-				\s\d+			# then a space then a number
-				\sFETCH			# then a space then the string 'FETCH'
-				\s\(			# then a space then an open paren :-) 
-				.*			# plus optional anything
-				FLAGS			# then the string "FLAGS"
-				.*			# plus anything else
-				(?!\\Deleted)		# but never "\Deleted"
-			/x,
-			$self->Results
-	);
-	
-
-	return $count;
-}
-
-
-sub uidvalidity {
-
-	my $self = shift; my $folder = shift;
-
-	my $vline = (grep(/UIDVALIDITY/i, $self->status($folder, "UIDVALIDITY")))[0];
-
-	my($validity) = $vline =~ /\(UIDVALIDITY\s+([^\)]+)/;
-
-	return $validity;
-}
-
-# 3 status folder (uidnext)
-# * STATUS folder (UIDNEXT 290)
-
-sub uidnext {
-
-	my $self = shift; my $folder = $self->Massage(shift);
-
-	my $line = (grep(/UIDNEXT/i, $self->status($folder, "UIDNEXT")))[0];
-
-	my($uidnext) = $line =~ /\(UIDNEXT\s+([^\)]+)/;
-
-	return $uidnext;
-}
-
-sub capability {
-
-	my $self = shift;
-
-	$self->_imap_command('CAPABILITY') or return undef;
-
-	my @caps = ref($self->{CAPABILITY}) 		? 
-			keys %{$self->{CAPABILITY}} 	: 
-			map { split } 
-				grep (s/^\*\s+CAPABILITY\s+//, 
-				$self->History($self->Count));
-
-	unless ( exists $self->{CAPABILITY} ) { 
-		for (@caps) { 
-			$self->{CAPABILITY}{uc($_)}++ ;
-			if (/=/) {
-				my($k,$v)=split(/=/,$_) ;
-				$self->{uc($k)} = uc($v) ;
-			}
-		} 
-	}
-	
-
-	return wantarray ? @caps : \@caps;
-}
-
-sub has_capability {
-	my $self = shift;
-	$self->capability;
-	local($^W)=0;
-	return $self->{CAPABILITY}{uc($_[0])};
-}
-
-sub imap4rev1 {
-	my $self = shift;
-	return exists($self->{_IMAP4REV1}) ?  
-		$self->{_IMAP4REV1} : 
-		$self->{_IMAP4REV1} = $self->has_capability(IMAP4REV1) ;
-}
-
-sub namespace {
-	# Returns a (reference to a?) nested list as follows:
-	# [ 
-	#  [
-	#   [ $user_prefix,  $user_delim  ] (,[$user_prefix2  ,$user_delim  ], [etc,etc] ),
-	#  ],
-	#  [
-	#   [ $shared_prefix,$shared_delim] (,[$shared_prefix2,$shared_delim], [etc,etc] ),
-	#  ],
-	#  [
-	#   [$public_prefix, $public_delim] (,[$public_prefix2,$public_delim], [etc,etc] ),
-	#  ],
-	# ] ;
-		
-	my $self = shift;
-	unless ( $self->has_capability("NAMESPACE") ) {
-			my $error = $self->Count . " NO NAMESPACE not supported by " . $self->Server ;
-			$self->LastError("$error\n") ;
-			$self->_debug("$error\n") ;
-			$@ = $error;
-			carp "$@" if $^W;
-			return undef;
-	}
-	my $namespace = (map({ /^\* NAMESPACE (.*)/ ? $1 : () } @{$self->_imap_command("NAMESPACE")->Results}))[0] ;
-	$namespace =~ s/\x0d?\x0a$//;
-	my($personal,$shared,$public) = $namespace =~ m#
-		(NIL|\((?:\([^\)]+\)\s*)+\))\s
-		(NIL|\((?:\([^\)]+\)\s*)+\))\s
-		(NIL|\((?:\([^\)]+\)\s*)+\))
-	#xi;
-	
-	my @ns = ();
-	$self->_debug("NAMESPACE: pers=$personal, shared=$shared, pub=$public\n");
-	push @ns, map {
-		$_ =~ s/^\((.*)\)$/$1/;
-		my @pieces = m#\(([^\)]*)\)#g;
-		$self->_debug("NAMESPACE pieces: " . join(", ",@pieces) . "\n");
-		my $ref = [];
-		foreach my $atom (@pieces) {
-			push @$ref, [ $atom =~ m#"([^"]*)"\s*#g ] ;
-		}
-		$_ =~ /^NIL$/i ? undef : $ref;
-	} ( $personal, $shared, $public) ;
-	return wantarray ? @ns : \@ns;
-}
-
-# Contributed by jwm3
-sub internaldate {
-        my $self = shift;
-        my $msg  = shift;
-        $self->_imap_command( ( $self->Uid ? "UID " : "" ) . "FETCH $msg INTERNALDATE") or return undef;
-        my $internalDate = join("", $self->History($self->Count));
-        $internalDate =~ s/^.*INTERNALDATE "//si;
-        $internalDate =~ s/\".*$//s;
-        return $internalDate;
-}
-
-sub is_parent {
-	my ($self, $folder) = (shift, shift);
-	# $self->_debug("Checking parentage ".( $folder ? "for folder $folder" : "" )."\n");
-        my $list = $self->list(undef, $folder)||"NO NO BAD BAD";
-	my $line = '';
-
-        for (my $m = 0; $m < scalar(@$list); $m++ ) {
-		#$self->_debug("Judging whether or not $list->[$m] is fit for parenthood\n");
-		return undef 
-		  if $list->[$m] =~ /NoInferior/i;       # let's not beat around the bush!
-
-                if ($list->[$m]  =~ s/(\{\d+\})\x0d\x0a$// ) {
-                        $list->[$m] .= $list->[$m+1];
-                        $list->[$m+1] = "";
-                }
-
-	    	$line = $list->[$m]
-                        if $list->[$m] =~
-                        /       ^\*\s+LIST              # * LIST
-                                \s+\([^\)]*\)\s+            # (Flags)
-                                "[^"]*"\s+              # "delimiter"
-                                (?:"([^"]*)"|(.*))\x0d\x0a$  # Name or "Folder name"
-                        /x;
-	}	
-	if ( $line eq "" ) {
-		$self->_debug("Warning: separator method found no correct o/p in:\n\t" .
-			join("\t",@list)."\n");
-	}
-	my($f) = $line =~ /^\*\s+LIST\s+\(([^\)]*)\s*\)/ if $line;
-	return  1 if $f =~ /HasChildren/i ;
-	return 0 if $f =~ /HasNoChildren/i ;
-	unless ( $f =~ /\\/) {		# no flags at all unless there's a backslash
-		my $sep = $self->separator($folder);
-		return 1 if scalar(grep /^${folder}${sep}/, $self->folders);
-		return 0;
-	}
-}
-
-sub selectable {my($s,$f)=@_;return grep(/NoSelect/i,$s->list("",$f))?0:1;}
-
-sub append_string {
-
-        my $self = shift;
-        my $folder = $self->Massage(shift);
-
-	my $text = shift;
-	$text =~ s/\x0d?\x0a/\x0d\x0a/g;
- 
-	my($flags,$date) = (shift,shift);
-
-	if (defined($flags)) {
-		$flags =~ s/^\s+//g;
-		$flags =~ s/\s+$//g;
-	}
-
-	if (defined($date)) {
-		$date =~ s/^\s+//g;
-		$date =~ s/\s+$//g;
-	}
-
-	$flags = "($flags)"  if $flags and $flags !~ /^\(.*\)$/ ;
-	$date  = qq/"$date"/ if $date  and $date  !~ /^"/ 	;
-
-        my $clear = $self->Clear;
-
-        $self->Clear($clear)
-                if $self->Count >= $clear and $clear > 0;
-
-	my $count 	= $self->Count($self->Count+1);
-
-        my $string = 	  "$count APPEND $folder "  	  . 
-			( $flags ? "$flags " : "" 	) . 
-			( $date ? "$date " : "" 	) . 
-			"{" . length($text)  . "}\x0d\x0a" ;
-
-        $self->_record($count,[ $self->_next_index($count), "INPUT", "$string\x0d\x0a" ] );
-
-	# Step 1: Send the append command.
-
-	my $feedback = $self->_send_line("$string");
-
-	unless ($feedback) {
-		$self->LastError("Error sending '$string' to IMAP: $!\n");
-		return undef;
-	}
-
-	my ($code, $output) = ("","");	
-	
-	# Step 2: Get the "+ go ahead" response
-	until ( $code ) {
-		$output = $self->_read_line or return undef;	
-		foreach my $o (@$output) { 
-
-			$self->_record($count,$o);	# $o is already an array ref
-			next unless $self->_is_output($o);
-
-                      ($code) = $o->[DATA] =~ /(^\+|^\d*\s*NO|^\d*\s*BAD)/i ;
-
-                      if ($o->[DATA] =~ /^\*\s+BYE/i) {
-                              $self->LastError("Error trying to append string: " . 
-						$o->[DATA]. "; Disconnected.\n");
-                              $self->_debug("Error trying to append string: " . $o->[DATA]. 
-					"; Disconnected.\n");
-                              carp("Error trying to append string: " . $o->[DATA] ."; Disconnected") if $^W;
-				$self->State(Unconnected);
-
-                      } elsif ( $o->[DATA] =~ /^\d*\s*(NO|BAD)/i ) { # i and / transposed!!!
-                              $self->LastError("Error trying to append string: " . $o->[DATA]  . "\n");
-                              $self->_debug("Error trying to append string: " . $o->[DATA] . "\n");
-                              carp("Error trying to append string: " . $o->[DATA]) if $^W;
-				return undef;
-			}
-		}
-	}	
-	
-	$self->_record($count,[ $self->_next_index($count), "INPUT", "$text\x0d\x0a" ] );
-
-	# Step 3: Send the actual text of the message:
-        $feedback = $self->_send_line("$text\x0d\x0a");
-
-        unless ($feedback) {
-                $self->LastError("Error sending append msg text to IMAP: $!\n");
-                return undef;
-        }
-	$code = undef;			# clear out code
-
-	# Step 4: Figure out the results:
-        until ($code) {
-                $output = $self->_read_line or return undef;
-              $self->_debug("Append results: " . map({ $_->[DATA] } @$output) . "\n" )
-			if $self->Debug;
-                foreach my $o (@$output) {
-			$self->_record($count,$o); # $o is already an array ref
-
-                      ($code) = $o->[DATA] =~ /^(?:$count|\*) (OK|NO|BAD)/im  ;
-			
-                      if ($o->[DATA] =~ /^\*\s+BYE/im) {
-				$self->State(Unconnected);
-                              $self->LastError("Error trying to append: " . $o->[DATA] . "\n");
-                              $self->_debug("Error trying to append: " . $o->[DATA] . "\n");
-                              carp("Error trying to append: " . $o->[DATA] ) if $^W;
-			}
-			if ($code and $code !~ /^OK/im) {
-                              $self->LastError("Error trying to append: " . $o->[DATA] . "\n");
-                              $self->_debug("Error trying to append: " . $o->[DATA] . "\n");
-                              carp("Error trying to append: " . $o->[DATA] ) if $^W;
-				return undef;
-			}
-        	}
-	}
-
-      my($uid) = join("",map { $_->[TYPE] eq "OUTPUT" ? $_->[DATA] : () } @$output ) =~ m#\s+(\d+)\]#;
-
-        return defined($uid) ? $uid : $self;
-}
-sub append {
-
-        my $self = shift;
-	# now that we're passing thru to append_string we won't massage here
-        # my $folder = $self->Massage(shift); 
-        my $folder = shift;
-
-	my $text = join("\x0d\x0a",@_);
-	$text =~ s/\x0d?\x0a/\x0d\x0a/g;
-	return $self->append_string($folder,$text);
-}
-
-sub append_file {
-
-        my $self 	= shift;
-        my $folder 	= $self->Massage(shift);
-	my $file 	= shift; 
-	my $control 	= shift || undef;
-	my $count 	= $self->Count($self->Count+1);
-
-
-	unless ( -f $file ) {
-		$self->LastError("File $file not found.\n");
-		return undef;
-	}
-
-	my $fh = IO::File->new($file) ;
-
-	unless ($fh) {
-		$self->LastError("Unable to open $file: $!\n");
-		$@ = "Unable to open $file: $!" ;
-		carp "unable to open $file: $!" if $^W;
-		return undef;
-	}
-
-	my $bare_nl_count = scalar grep { /^\x0a$|[^\x0d]\x0a$/} <$fh>;
-
-	seek($fh,0,0);
-	
-        my $clear = $self->Clear;
-
-        $self->Clear($clear)
-                if $self->Count >= $clear and $clear > 0;
-
-	my $length = ( -s $file ) + $bare_nl_count;
-
-        my $string = "$count APPEND $folder {" . $length  . "}\x0d\x0a" ;
-
-        $self->_record($count,[ $self->_next_index($count), "INPUT", "$string" ] );
-
-	my $feedback = $self->_send_line("$string");
-
-	unless ($feedback) {
-		$self->LastError("Error sending '$string' to IMAP: $!\n");
-		close $fh;
-		return undef;
-	}
-
-	my ($code, $output) = ("","");	
-	
-	until ( $code ) {
-		$output = $self->_read_line or close $fh, return undef;	
-		foreach my $o (@$output) {
-			$self->_record($count,$o);		# $o is already an array ref
-                      ($code) = $o->[DATA] =~ /(^\+|^\d+\sNO|^\d+\sBAD)/i; 
-                      if ($o->[DATA] =~ /^\*\s+BYE/) {
-                              carp $o->[DATA] if $^W;
-				$self->State(Unconnected);
-				close $fh;
-				return undef ;
-                      } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-                              carp $o->[DATA] if $^W;
-				close $fh;
-				return undef;
-			}
-		}
-	}	
-	
-	{ 	# Narrow scope
-		# Slurp up headers: later we'll make this more efficient I guess
-		local $/ = "\x0d\x0a\x0d\x0a"; 
-		my $text = <$fh>;
-		$text =~ s/\x0d?\x0a/\x0d\x0a/g;
-		$self->_record($count,[ $self->_next_index($count), "INPUT", "{From file $file}" ] ) ;
-		$feedback = $self->_send_line($text);
-
-		unless ($feedback) {
-			$self->LastError("Error sending append msg text to IMAP: $!\n");
-			close $fh;
-			return undef;
-		}
-		_debug $self, "control points to $$control\n" if ref($control) and $self->Debug;
-		$/ = 	ref($control) ?  "\x0a" : $control ? $control : 	"\x0a";	
-		while (defined($text = <$fh>)) {
-			$text =~ s/\x0d?\x0a/\x0d\x0a/g;
-			$self->_record(	$count,
-					[ $self->_next_index($count), "INPUT", "{from $file}\x0d\x0a" ] 
-			);
-			$feedback = $self->_send_line($text,1);
-
-			unless ($feedback) {
-				$self->LastError("Error sending append msg text to IMAP: $!\n");
-				close $fh;
-				return undef;
-			}
-		}
-		$feedback = $self->_send_line("\x0d\x0a");
-
-		unless ($feedback) {
-			$self->LastError("Error sending append msg text to IMAP: $!\n");
-			close $fh;
-			return undef;
-		}
-	} 
-
-	# Now for the crucial test: Did the append work or not?
-	($code, $output) = ("","");	
-
-	my $uid = undef;	
-	until ( $code ) {
-		$output = $self->_read_line or return undef;	
-		foreach my $o (@$output) {
-			$self->_record($count,$o);		# $o is already an array ref
-                      $self->_debug("append_file: Deciding if " . $o->[DATA] . " has the code.\n") 
-				if $self->Debug;
-                      ($code) = $o->[DATA]  =~ /^\d+\s(NO|BAD|OK)/i; 
-			# try to grab new msg's uid from o/p
-                      $o->[DATA]  =~ m#UID\s+\d+\s+(\d+)\]# and $uid = $1; 
-                      if ($o->[DATA] =~ /^\*\s+BYE/) {
-                              carp $o->[DATA] if $^W;
-				$self->State(Unconnected);
-				close $fh;
-				return undef ;
-                      } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-                              carp $o->[DATA] if $^W;
-				close $fh;
-				return undef;
-			}
-		}
-	}	
-	close $fh;
-
-	if ($code !~ /^OK/i) {
-		return undef;
-	}
-
-
-        return defined($uid) ? $uid : $self;
-}
-
-
-sub authenticate {
-
-        my $self 	= shift;
-        my $scheme 	= shift;
-        my $response 	= shift;
-	
-	$scheme   ||= $self->Authmechanism;
-	$response ||= $self->Authcallback;
-        my $clear = $self->Clear;
-
-        $self->Clear($clear)
-                if $self->Count >= $clear and $clear > 0;
-
-	my $count 	= $self->Count($self->Count+1);
-
-
-        my $string = "$count AUTHENTICATE $scheme";
-
-        $self->_record($count,[ $self->_next_index($self->Transaction), 
-				"INPUT", "$string\x0d\x0a"] );
-
-	my $feedback = $self->_send_line("$string");
-
-	unless ($feedback) {
-		$self->LastError("Error sending '$string' to IMAP: $!\n");
-		return undef;
-	}
-
-	my ($code, $output);	
-	
-	until ($code) {
-		$output = $self->_read_line or return undef;	
-		foreach my $o (@$output) {
-			$self->_record($count,$o);	# $o is a ref
-			($code) = $o->[DATA] =~ /^\+(.*)$/ ;
-			if ($o->[DATA] =~ /^\*\s+BYE/) {
-				$self->State(Unconnected);
-				return undef ;
-			}
-		}
-	}	
-	
-        return undef if $code =~ /^BAD|^NO/ ;
-
-        if ('CRAM-MD5' eq $scheme && ! $response) {
-          if ($Mail::IMAPClient::_CRAM_MD5_ERR) {
-            $self->LastError($Mail::IMAPClient::_CRAM_MD5_ERR);
-            carp $Mail::IMAPClient::_CRAM_MD5_ERR if $^W;
-          } else {
-            $response = \&_cram_md5;
-          }
-        }
-
-        $feedback = $self->_send_line($response->($code, $self));
-
-        unless ($feedback) {
-                $self->LastError("Error sending append msg text to IMAP: $!\n");
-                return undef;
-        }
-
-	$code = ""; 	# clear code
-        until ($code) {
-                $output = $self->_read_line or return undef;
-		foreach my $o (@$output) {
-                	$self->_record($count,$o);	# $o is a ref
-			if ( ($code) = $o->[DATA] =~ /^\+ (.*)$/ ) {
-				$feedback = $self->_send_line($response->($code,$self));
-				unless ($feedback) {
-					$self->LastError("Error sending append msg text to IMAP: $!\n");
-					return undef;
-				}
-				$code = "" ;		# Clear code; we're still not finished
-			} else {
-				$o->[DATA] =~ /^$count (OK|NO|BAD)/ and $code = $1;
-				if ($o->[DATA] =~ /^\*\s+BYE/) {
-					$self->State(Unconnected);
-					return undef ;
-				}
-			}
-		}
-        }
-
-        $code =~ /^OK/ and $self->State(Authenticated) ;
-        return $code =~ /^OK/ ? $self : undef ;
-
-}
-
-# UIDPLUS response from a copy: [COPYUID (uidvalidity) (origuid) (newuid)]
-sub copy {
-
-	my($self, $target, @msgs) = @_;
-
-	$target = $self->Massage($target);
-	if ( $self->Ranges ) {
-		@msgs = ($self->Range(@msgs));
-	} else {
-		@msgs   = sort { $a <=> $b } map { ref($_)? @$_ : split(',',$_) } @msgs;
-	}
-
-	$self->_imap_command( 
-	  ( 	$self->Uid ? "UID " : "" ) . 
-		"COPY " . 
-		( $self->Ranges ? $self->Range(@msgs) : 
-		join(',',map { ref($_)? @$_ : $_ } @msgs)) . 
-		" $target"
-	) 			or return undef		;
-	my @results =  $self->History($self->Count) 	;
-	
-	my @uids;
-
-	for my $r (@results) {
-			
-               chomp $r;
-               $r =~ s/\r$//;
-               $r =~ s/^.*\[COPYUID\s+\d+\s+[\d:,]+\s+([\d:,]+)\].*/$1/ or next;
-               push @uids, ( $r =~ /(\d+):(\d+)/ ? $1 ... $2 : split(/,/,$r) ) ;
-
-	}
-
-	return scalar(@uids) ? join(",",@uids) : $self;
-}
-
-sub move {
-
-	my($self, $target, @msgs) = @_;
-
-	$self->create($target) and $self->subscribe($target) 
-		unless $self->exists($target);
-	
-	my $uids = $self->copy($target, map { ref($_) =~ /ARRAY/ ? @{$_} : $_ } @msgs) 
-		or return undef;
-
-	$self->delete_message(@msgs) or carp $self->LastError;
-	
-	return $uids;
-}
-
-sub set_flag {
-	my($self, $flag, @msgs) = @_;
-	if ( ref($msgs[0]) =~ /ARRAY/ ) { @msgs = @{$msgs[0]} };
-	$flag =~ /^\\/ or $flag = "\\" . $flag 
-		if $flag =~ /^(Answered|Flagged|Deleted|Seen|Draft)$/i;
-	if ( $self->Ranges ) {
-		$self->store( $self->Range(@msgs), "+FLAGS.SILENT (" . $flag . ")" );
-	} else {
-		$self->store( join(",",@msgs), "+FLAGS.SILENT (" . $flag . ")" );
-	}
-}
-
-sub see {
-	my($self, @msgs) = @_;
-	if ( ref($msgs[0]) =~ /ARRAY/ ) { @msgs = @{$msgs[0]} };
-	$self->set_flag('\\Seen', @msgs);
-}
-
-sub mark {
-	my($self, @msgs) = @_;
-	if ( ref($msgs[0]) =~ /ARRAY/ ) { @msgs = @{$msgs[0]} };
-	$self->set_flag('\\Flagged', @msgs);
-}
-
-sub unmark {
-	my($self, @msgs) = @_;
-	if ( ref($msgs[0]) =~ /ARRAY/ ) { @msgs = @{$msgs[0]} };
-	$self->unset_flag('\\Flagged', @msgs);
-}
-
-sub unset_flag {
-	my($self, $flag, @msgs) = @_;
-	if ( ref($msgs[0]) =~ /ARRAY/ ) { @msgs = @{$msgs[0]} };
-	$flag =~ /^\\/ or $flag = "\\" . $flag 
-		if $flag =~ /^(Answered|Flagged|Deleted|Seen|Draft)$/i;
-	$self->store( join(",",@msgs), "-FLAGS.SILENT (" . $flag . ")" );
-}
-
-sub deny_seeing {
-	my($self, @msgs) = @_;
-	if ( ref($msgs[0]) =~ /ARRAY/ ) { @msgs = @{$msgs[0]} };
-	$self->unset_flag('\\Seen', @msgs);
-}
-
-sub size {
-
-	my ($self,$msg) = @_;
-	# return undef unless fetch is successful
-	my @data = $self->fetch($msg,"(RFC822.SIZE)");
-	return undef unless defined($data[0]);
-	my($size) = grep(/RFC822\.SIZE/,@data);
-
-	$size =~ /RFC822\.SIZE\s+(\d+)/;
-	
-	return $1;
-}
-
-sub getquotaroot {
-	my $self = shift;
-	my $what = shift;
-	$what = ( $what ? $self->Massage($what) : "INBOX" ) ;
-	$self->_imap_command("getquotaroot $what") or return undef;
-	return $self->Results;
-}
-
-sub getquota {
-	my $self = shift;
-	my $what = shift;
-	$what = ( $what ? $self->Massage($what) : "user/$self->{User}" ) ;
-	$self->_imap_command("getquota $what") or return undef;
-	return $self->Results;
-}
-
-sub quota 	{
-	my $self = shift;
-	my ($what) = shift||"INBOX";
-	$self->_imap_command("getquota $what")||$self->getquotaroot("$what");
-	return (	map { s/.*STORAGE\s+\d+\s+(\d+).*\n$/$1/ ? $_ : () } $self->Results
-	)[0] ;
-}
-
-sub quota_usage 	{
-	my $self = shift;
-	my ($what) = shift||"INBOX";
-	$self->_imap_command("getquota $what")||$self->getquotaroot("$what");
-	return (	map { s/.*STORAGE\s+(\d+)\s+\d+.*\n$/$1/ ? $_ : () } $self->Results
-	)[0] ;
-}
-sub Quote {
-	my($class,$arg) = @_;
-	return $class->Massage($arg,NonFolderArg);
-}
-
-sub Massage {
-	my $self= shift;
-	my $arg = shift;
-	my $notFolder = shift;
-	return unless $arg;
-	my $escaped_arg = $arg; $escaped_arg =~ s/"/\\"/g;
-	$arg 	= substr($arg,1,length($arg)-2) if $arg =~ /^".*"$/
-                and ! ( $notFolder or $self->STATUS(qq("$escaped_arg"),"(MESSAGES)"));
-
-	if ($arg =~ /["\\]/) {
-		$arg = "{" . length($arg) . "}\x0d\x0a$arg" ;
-	} elsif ($arg =~ /\s|[{}()]/) {
-		$arg = qq("${arg}") unless $arg =~ /^"/;
-	} 
-
-	return $arg;
-}
-
-sub unseen_count {
-
-	my ($self, $folder) = (shift, shift);
-	$folder ||= $self->Folder;
-	$self->status($folder, 'UNSEEN') or return undef;
-
-	chomp(	my $r = ( grep 
-			  { s/\*\s+STATUS\s+.*\(UNSEEN\s+(\d+)\s*\)/$1/ }
-			  $self->History($self->Transaction)
-			)[0]
-	);
-
-	$r =~ s/\D//g;
-	return $r;
-}
-
-
-
-# Status Routines:
-
-
-sub Status            { $_[0]->State                           ;       }
-sub IsUnconnected     { ($_[0]->State == Unconnected)  ? 1 : 0 ;       }
-sub IsConnected       { ($_[0]->State >= Connected)    ? 1 : 0 ;       }
-sub IsAuthenticated   { ($_[0]->State >= Authenticated)? 1 : 0 ;       }
-sub IsSelected        { ($_[0]->State == Selected)     ? 1 : 0 ;       }               
-
-
-# The following private methods all work on an output line array.
-# _data returns the data portion of an output array:
-sub _data {   defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] or return undef; $_[1]->[DATA]; }
-
-# _index returns the index portion of an output array:
-sub _index {  defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] or return undef; $_[1]->[INDEX]; }
-
-# _type returns the type portion of an output array:
-sub _type {  defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] or return undef; $_[1]->[TYPE]; }
-
-# _is_literal returns true if this is a literal:
-sub _is_literal { defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] and $_[1]->[TYPE] eq "LITERAL" };
-
-# _is_output_or_literal returns true if this is an 
-#  	output line (or the literal part of one):
-sub _is_output_or_literal { 
-              defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] and 
-			($_[1]->[TYPE] eq "OUTPUT" || $_[1]->[TYPE] eq "LITERAL") 
-};
-
-# _is_output returns true if this is an output line:
-sub _is_output { defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] and $_[1]->[TYPE] eq "OUTPUT" };
-
-# _is_input returns true if this is an input line:
-sub _is_input { defined $_[1] and ref $_[1] and defined $_[1]->[TYPE] and $_[1]->[TYPE] eq "INPUT" };
-
-# _next_index returns next_index for a transaction; may legitimately return 0 when successful.
-sub _next_index { 
-      defined(scalar(@{$_[0]->{'History'}{$_[1]||$_[0]->Transaction}}))       ? 
-		scalar(@{$_[0]->{'History'}{$_[1]||$_[0]->Transaction}}) 		: 0 
-};
-
-sub _cram_md5 {
-  my ($code, $client) = @_;
-  my $hmac = Digest::HMAC_MD5::hmac_md5_hex(MIME::Base64::decode($code),
-                                            $client->Password());
-  return MIME::Base64::encode($client->User() . " $hmac");
-}
-
-
-
-sub Range {
-	require "Mail/IMAPClient/MessageSet.pm";
-	my $self = shift;
-	my $targ = $_[0];
-	#print "Arg is ",ref($targ),"\n";
-	if (@_ == 1 and ref($targ) =~ /Mail::IMAPClient::MessageSet/ ) {
-		return $targ;
-	}
-	my $range = Mail::IMAPClient::MessageSet->new(@_);
-	#print "Returning $range :",ref($range)," == $range\n";
-	return $range;
-}
-
-my $not_void = 1;
diff --git a/freshmeat_submition.inp b/freshmeat_submition.inp
index d9da769..04f4023 100644
--- a/freshmeat_submition.inp
+++ b/freshmeat_submition.inp
@@ -3,10 +3,10 @@
 #RELEASE_FOCUS="Initial freshmeat announcement"
 #RELEASE_FOCUS="Documentation"
 #RELEASE_FOCUS="Code cleanup"
-#RELEASE_FOCUS="Minor feature  enhancements"
+RELEASE_FOCUS="Minor feature  enhancements"
 #RELEASE_FOCUS="Major  feature  enhancements"
 #RELEASE_FOCUS="Minor bugfixes"
-RELEASE_FOCUS="Major bugfixes"
+#RELEASE_FOCUS="Major bugfixes"
 #RELEASE_FOCUS="Minor security fixes"
 #RELEASE_FOCUS="Major security fixes"
 
@@ -16,14 +16,12 @@ RELEASE_FOCUS="Major bugfixes"
 #TEXT_BODY="Bug fix: rewrote the way to store messages to avoid freeze problems with some imap servers"
 #TEXT_BODY="Bug fix: Allow long usernames with md5 authentification."
 TEXT_BODY="Bug fixes:
-- Avoid infinite loop with bad hostname.
-- Works without patch on MSWin32 systems.
-- Updated help message : avoid --authuser and --authmech1 SOMETHING
-- Uppercase --authmech input.
-- Date with minus %d-%b-%Y (RFC compliant)
-- Added Date::Manip dependency.
-- Added Dovecot 1.0.0 [dest] success.
-- Added Deerfield VisNetic MailServer 5.8.6 [from] success.
-- Turn to --nofastio1 --nofastio2 by default.
-- Flags \Recent can be uppercase \RECENT now.
+- Turned on --syncinternaldates option by default.
+- Set timezone TZ=GMT if no timezone is set (MSWindows "bug").
+- Ignore message when it has no header.
+- Added message id in output warning when no header found.
+- Removed public freshmeat annoucement access since 1.241 was not mine (no problem) and not correct (problem).
+- Can run with IMAPClient_3.x.x without redefine any function (but 3.x.x is still buggy and to be avoided)
+- Started unit tests.
+- Many thanks to the freshmeat folk that correct my bad and poorly English !
 "
diff --git a/imapsync b/imapsync
index 467188b..7cd624f 100755
--- a/imapsync
+++ b/imapsync
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 =pod
 
@@ -9,7 +9,7 @@ tool. Synchronise mailboxes between two imap servers. Good
 at IMAP migration. More than 32 different IMAP server softwares
 supported with success.
 
-$Revision: 1.241 $
+$Revision: 1.249 $
 
 =head1 INSTALL
 
@@ -387,15 +387,17 @@ Entries for imapsync:
 
 Feedback (good or bad) will be always welcome.
 
-$Id: imapsync,v 1.241 2007/12/31 13:39:02 gilles Exp gilles $
+$Id: imapsync,v 1.249 2008/03/19 02:14:24 gilles Exp $
 
 
 
 =cut
 
 
+use warnings;
 ++$|;
 use strict;
+use Carp;
 use Getopt::Long;
 use Mail::IMAPClient;
 use Digest::MD5  qw(md5_base64);
@@ -450,14 +452,14 @@ my(
 use vars qw ($opt_G); # missing code for this will be option.
 
 
-$rcs = ' $Id: imapsync,v 1.241 2007/12/31 13:39:02 gilles Exp gilles $ ';
+$rcs = ' $Id: imapsync,v 1.249 2008/03/19 02:14:24 gilles Exp $ ';
 $rcs =~ m/,v (\d+\.\d+)/;
 $VERSION = ($1) ? $1 : "UNKNOWN";
 
 my $VERSION_IMAPClient = $Mail::IMAPClient::VERSION;
 
 check_lib_version() or 
-  die "imapsync needs perl lib Mail::IMAPClient release 2.2.9 exactly, future imapsync release may suppoort 3.0.x, but sorry not now\n";
+  die "imapsync needs perl lib Mail::IMAPClient release 2.2.9 exactly, future imapsync release may suppoort 3.0.x, but sorry not now. See file BUG_IMAPClient_3.xx\n";
 
 
 $mess_size_total_trans   = 0;
@@ -467,15 +469,16 @@ $mess_trans = $mess_skipped = $mess_skipped_dry = 0;
 
 
 sub check_lib_version {
-	if ($VERSION_IMAPClient =~ m/(\d+)\.(\d+)\.(\d+)/) {
-		$debug and print "VERSION_IMAPClient $1 $2 $3\n";
-		#my($major,$minor,$sub) = ($1, $2, $3);
-		
-		return(1) if($VERSION_IMAPClient eq '2.2.9');
-		
+	$debug and print "VERSION_IMAPClient $1 $2 $3\n";
+	if ($VERSION_IMAPClient eq '2.2.9') {
+		override_imapclient();
+		return(1);
 	}
 	else{
-		return 0; # don't match regex => bad
+		# 3.x.x is still buggy with imapsync.
+		# uncomment "return 1" if you want to check it.
+		#return 1;
+		return 0;
 	}
 }
 
@@ -483,8 +486,8 @@ $error=0;
 
 my $banner = join("", 
 		  '$RCSfile: imapsync,v $ ',
-		  '$Revision: 1.241 $ ',
-		  '$Date: 2007/12/31 13:39:02 $ ',
+		  '$Revision: 1.249 $ ',
+		  '$Date: 2008/03/19 02:14:24 $ ',
 		  "\n",localhost_info(),
 		  " and the module Mail::IMAPClient version used here is ",
 		  $VERSION_IMAPClient,"\n",
@@ -510,11 +513,9 @@ $split1 ||= 1000;
 $split2 ||= 1000;
 
 $host1 || missing_option("--host1") ;
-# $port1 = (defined($port1)) ? $port1 : 143;
 $port1 ||= defined $ssl1 ? 993 : 143;
 
 $host2 || missing_option("--host2") ;
-# $port2 = (defined($port2)) ? $port2 : 143;
 $port2 ||= defined $ssl2 ? 993 : 143;
 
 sub connect_imap {
@@ -523,7 +524,7 @@ sub connect_imap {
 	$imap->Server($host);
 	$imap->Port($port);
 	$imap->Debug($debugimap);
-	$imap->connect2()
+	$imap->connect()
 	  or die "Can not open imap connection on [$host] : $@\n";	
 }
 
@@ -559,6 +560,28 @@ if ($justconnect) {
 $user1 || missing_option("--user1");
 $user2 || missing_option("--user2");
 
+$syncinternaldates = defined($syncinternaldates) ? defined($syncinternaldates) : 1;
+if ($syncinternaldates) {
+	print "Turned ON syncinternaldates, will set the internal dates on host2 same as host1.\n";
+}else{
+	print "Turned OFF syncinternaldates\n";
+}
+
+if ($syncinternaldates) {
+	no warnings 'redefine';
+	local *Carp::confess = sub { return undef; };
+	require Date::Manip;
+	Date::Manip->import(qw(ParseDate Date_Cmp UnixDate Date_Init Date_TimeZone));
+	#print "Date_init : [", join(" ",Date_Init()), "]\n";
+	print "TimeZone :[", Date_TimeZone(), "]\n";
+	if (not (Date_TimeZone())) {
+		warn "TimeZone not defined, setting it to GMT";
+		Date_Init("TZ=GMT");
+		print "TimeZone : [", Date_TimeZone(), "]\n";
+	}
+}
+
+
 if(defined($authmd5) and not($authmd5)) {
 	$authmech1 ||= 'LOGIN';
 	$authmech2 ||= 'LOGIN';
@@ -574,8 +597,8 @@ $authmech2 = uc($authmech2);
 $authuser1 ||= $user1;
 $authuser2 ||= $user2;
 
-print "will try to use $authmech1 authentication on host1\n";
-print "will try to use $authmech2 authentication on host2\n";
+print "Will try to use $authmech1 authentication on host1\n";
+print "Will try to use $authmech2 authentication on host2\n";
 
 $syncacls = (defined($syncacls)) ? $syncacls : 0;
 $foldersizes = (defined($foldersizes)) ? $foldersizes : 1;
@@ -584,6 +607,7 @@ $fastio1 = (defined($fastio1)) ? $fastio1 : 0;
 $fastio2 = (defined($fastio2)) ? $fastio2 : 0;
 
 
+
 @useheader = ("ALL") unless (@useheader);
 
 print "From imap server [$host1] port [$port1] user [$user1]\n";
@@ -670,7 +694,7 @@ sub login_imap {
 		$imap->State(Mail::IMAPClient::Connected);
 	} 
 	else {
-		$imap->connect2()
+		$imap->connect()
 	  or die "Can not open imap connection on [$host] with user [$user] : $@\n";
 	}
 	print "Banner : ", server_banner($imap);
@@ -696,13 +720,13 @@ sub login_imap {
 	$imap->User($user);
 	$imap->Authuser($authuser);
 	$imap->Password($password);
-	unless ($imap->login2()) {
+	unless ($imap->login()) {
 		print "Error login : [$host] with user [$user] auth [$authmech]: $@\n";
 		die if ($authmech eq 'LOGIN');
 		die if $imap->IsUnconnected();
 		print "Trying LOGIN Auth mechanism on [$host] with user [$user]\n";
 		$imap->Authmechanism("");
-		$imap->login2() or
+		$imap->login() or
 		  die "Error login : [$host] with user [$user] auth [LOGIN] : $@";
 	}
 	print "Success login on [$host] with user [$user] auth [$authmech]\n";
@@ -1040,7 +1064,7 @@ sub foldersizes {
 			$smess = $imap->message_count();
 			unless ($smess == 0) {
 				#$imap->Ranges(1);
-				$imap->fetch_hash2("RFC822.SIZE",$hashref) or die "$@";
+				$imap->fetch_hash("RFC822.SIZE",$hashref) or die "$@";
 				#$imap->Ranges(0);
 				#print map {$hashref->{$_}->{"RFC822.SIZE"}, " "} keys %$hashref;
 				map {$stot += $hashref->{$_}->{"RFC822.SIZE"}} keys %$hashref;
@@ -1245,10 +1269,10 @@ FOLDER: foreach my $f_fold (@f_folders) {
 	last FOLDER if $from->IsUnconnected();
 	last FOLDER if   $to->IsUnconnected();
 
-	my $f_heads = $from->parse_headers2([@f_msgs],
+	my $f_heads = $from->parse_headers([@f_msgs],
 					    @useheader)if (@f_msgs) ;
 	$debug and print "Time headers: ", timenext(), " s\n";
-	my $f_fir  = $from->fetch_hash2("FLAGS",
+	my $f_fir  = $from->fetch_hash("FLAGS",
 				       "INTERNALDATE",
 				       "RFC822.SIZE") if (@f_msgs);
 	$debug and print "Time fir  : ", timenext(), " s\n";
@@ -1262,10 +1286,10 @@ FOLDER: foreach my $f_fold (@f_folders) {
 	last FOLDER if $from->IsUnconnected();
 	last FOLDER if   $to->IsUnconnected();
 
-	my $t_heads =   $to->parse_headers2([@t_msgs],
+	my $t_heads =   $to->parse_headers([@t_msgs],
 					    @useheader) if (@t_msgs);
 	$debug and print "Time headers: ", timenext(), " s\n";
-	my $t_fir  =   $to->fetch_hash2("FLAGS",
+	my $t_fir  =   $to->fetch_hash("FLAGS",
 				       "INTERNALDATE",
 				       "RFC822.SIZE") if (@t_msgs);
 	$debug and print "Time fir  : ", timenext(), " s\n";
@@ -1314,28 +1338,38 @@ FOLDER: foreach my $f_fold (@f_folders) {
 			# copy
 			print "+ Copying msg #$f_msg:$f_size to folder $t_fold\n";
 			last FOLDER if $from->IsUnconnected();
-			#my $string = $from->message_string($f_msg);			
-			my $message_file = "tmp_imapsync_$$";
-			unlink($message_file);
-			$from->message_to_file($message_file, $f_msg);
-			my $string = file_to_string($message_file);
+			my $string;
+			$string = $from->message_string($f_msg);
+			#print "AAAmessage_string[$string]ZZZ\n";
+			#my $message_file = "tmp_imapsync_$$";
+			#$from->select($f_fold);
+			#unlink($message_file);
+			#$from->message_to_file($message_file, $f_msg) or do {
+			#	warn "Could not put message #$f_msg to file $message_file",
+			#	$from->LastError;
+			#	$error++;
+			#	$mess_size_total_error += $f_size;
+			#	next MESS;
+			#};
+			#$string = file_to_string($message_file);
+			#print "AAA1[$string]ZZZ\n";
 			#unlink($message_file);
 			if (@regexmess) {
 				foreach my $regexmess (@regexmess) {
 					$debug and print "eval \$string =~ $regexmess\n";
 					eval("\$string =~ $regexmess");
 				}
-				string_to_file($string, $message_file);
+				#string_to_file($string, $message_file);
 			}
-			$debug and print "F message content begin next line\n",
-			  $string,
-			    "F message content ended on previous line\n";
+			$debug and print 
+				"=" x80, "\n", 
+				"F message content begin next line\n",
+				$string,
+				"F message content ended on previous line\n", "=" x 80, "\n";
 			my $d = "";
 			if ($syncinternaldates) {
 				$d = $f_idate;
-				$debug and print "internal date from 1: [$d]\n";
-				require Date::Manip;
-				Date::Manip->import(qw(ParseDate Date_Cmp UnixDate));
+				$debug and print "internal date from 1: [$d]\n";				
 				$d = UnixDate(ParseDate($d), "%d-%b-%Y %H:%M:%S %z");
 				$d = "\"$d\"";
 				$debug and print "internal date from 1: [$d] (fixed)\n";
@@ -1355,7 +1389,10 @@ FOLDER: foreach my $f_fold (@f_folders) {
 					$new_id = $to->append_string($t_fold,$string, $flags_f, $d);
 				}
 				else {
-					$new_id = $to->append_file2($t_fold, $message_file, "", $flags_f, $d);
+					# just back to append_string since append_file 3.05 does not work. 
+					#$new_id = $to->append_file($t_fold, $message_file, "", $flags_f, $d);
+					# append_string 3.05 does not work too.
+					$new_id = $to->append_string($t_fold,$string, $flags_f, $d);
 				}
 				unless($new_id){
 					warn "Couldn't append msg #$f_msg (Subject:[".
@@ -1382,7 +1419,7 @@ FOLDER: foreach my $f_fold (@f_folders) {
 			else{
 				$mess_skipped_dry += 1;
 			}
-			unlink($message_file);
+			#unlink($message_file);
 			next MESS;
 		}
 		else{
@@ -1471,6 +1508,9 @@ FOLDER: foreach my $f_fold (@f_folders) {
 
 print "Time : ", timenext(), " s\n";
 }
+
+
+
 $from->logout();
 $to->logout();
 
@@ -1483,6 +1523,7 @@ stats();
 
 
 
+
 exit(1) if($error);
 
 sub select_msgs {
@@ -1633,7 +1674,7 @@ sub parse_header_msg1 {
 	my $head = $s_heads->{$m_uid};
 	my $headnum =  scalar(keys(%$head));
 	$debug and print "Head NUM:", $headnum, "\n";
-	unless($headnum) { print "Warning : no header used or found \n"; }
+	unless($headnum) { print "Warning : no header used or found for message $m_uid\n"; }
 	my $headstr;
 	
 	foreach my $h (sort keys(%$head)){
@@ -1645,20 +1686,29 @@ sub parse_header_msg1 {
 			# and uppercase  header keywords 
 			# (dbmail and dovecot)
 			$val =~ s/^\s*(.+)$/$1/;
-			my $H = uc($h);
+			
+			#my $H = uc($h);
+			my $H = "$h: $val";
 			# show stuff in debug mode
 			$debug and print "${s}H $H:", $val, "\n";
+			
 			if ($skipheader and $H =~ m/$skipheader/i) {
-				$debug and print "Skipping header $h\n";
+				$debug and print "Skipping header $H\n";
 				next;
 			}
-			$headstr .= "$H:". $val;
+			#$headstr .= "$H:". $val;
+			$headstr .= "$H";
 		}
 	}
 	#return unless ($headstr);
 	unless ($headstr){
-		print "no header so taking everything\n";
-		$headstr = $imap->message_string($m_uid);
+		# taking everything is too heavy,
+		# should take only 1 Ko
+		#print "no header so taking everything\n";
+		#$headstr = $imap->message_string($m_uid);
+		
+		print "no header so we ignore this message\n";
+		return;
 	}
 	my $size  = $s_fir->{$m_uid}->{"RFC822.SIZE"};
 	my $flags = $s_fir->{$m_uid}->{"FLAGS"};
@@ -1791,7 +1841,8 @@ Several options are mandatory.
                          it will change in future releases.
 --expunge1             : expunge messages on source account.
 --expunge2             : expunge messages on target account.
---syncinternaldates    : sets the internal dates on host2 same as host1
+--syncinternaldates    : sets the internal dates on host2 same as host1.
+                         Turned on by default.
 --buffersize  <int>    : sets the size of a block of I/O.
 --maxsize     <int>    : skip messages larger than <int> bytes
 --maxage      <int>    : skip messages older than <int> days.
@@ -1863,27 +1914,24 @@ sub tests {
 	}
 }
 
+sub override_imapclient {
+no warnings 'redefine';
+no strict 'subs';
 
-package Mail::IMAPClient;
+use constant Unconnected => 0;
+use constant Connected         => 1;            # connected; not logged in
+use constant Authenticated => 2;                # logged in; no mailbox selected
+use constant Selected => 3;                     # mailbox selected
+use constant INDEX => 0;                        # Array index for output line number
+use constant TYPE => 1;                         # Array index for line type 
+                                                #    (either OUTPUT, INPUT, or LITERAL)
+use constant DATA => 2;                         # Array index for output line data
+use constant NonFolderArg => 1;                 # Value to pass to Massage to 
+                                                # indicate non-folder argument
 
 
-sub Authuser {
-	my $self = shift;
-	
-	if (@_) { $self->{AUTHUSER} = shift }
-	return $self->{AUTHUSER};
-}
 
-
-sub Split {
-	my $self = shift;
-	
-	if (@_) { $self->{SPLIT} = shift }
-	return $self->{SPLIT};
-}
-
-# From IMAPClient.pm
-sub append_file2 {
+*Mail::IMAPClient::append_file = sub  {
 
         my $self        = shift;
         my $folder      = $self->Massage(shift);
@@ -1917,7 +1965,7 @@ sub append_file2 {
         unless ($fh) {
                 $self->LastError("Unable to open $file: $!\n");
                 $@ = "Unable to open $file: $!" ;
-                carp "unable to open $file: $!" if $^W;
+                carp "unable to open $file: $!";
                 return undef;
         }
 
@@ -1955,12 +2003,12 @@ sub append_file2 {
                         $self->_record($count,$o);              # $o is already an array ref
                       ($code) = $o->[DATA] =~ /(^\+|^\d+\sNO|^\d+\sBAD)/i; 
                       if ($o->[DATA] =~ /^\*\s+BYE/) {
-                              carp $o->[DATA] if $^W;
+                              carp $o->[DATA];
                                 $self->State(Unconnected);
                                 $fh->close;
                                 return undef ;
                       } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-                              carp $o->[DATA] if $^W;
+                              carp $o->[DATA];
                                 $fh->close;
                                 return undef;
                         }
@@ -1980,7 +2028,7 @@ sub append_file2 {
                         $fh->close;
                         return undef;
                 }
-                _debug $self, "control points to $$control\n" if ref($control) and $self->Debug;
+                _debug($self, "control points to $$control\n") if ref($control) and $self->Debug;
                 $/ =    ref($control) ?  "\x0a" : $control ? $control :         "\x0a";
                 while (defined($text = <$fh>)) {
                         $text =~ s/\x0d?\x0a/\x0d\x0a/g;
@@ -2018,12 +2066,12 @@ sub append_file2 {
                         # try to grab new msg's uid from o/p
                       $o->[DATA]  =~ m#UID\s+\d+\s+(\d+)\]# and $uid = $1; 
                       if ($o->[DATA] =~ /^\*\s+BYE/) {
-                              carp $o->[DATA] if $^W;
+                              carp $o->[DATA];
                                 $self->State(Unconnected);
                                 $fh->close;
                                 return undef ;
                       } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-                              carp $o->[DATA] if $^W;
+                              carp $o->[DATA];
                                 $fh->close;
                                 return undef;
                         }
@@ -2037,10 +2085,12 @@ sub append_file2 {
 
 
         return defined($uid) ? $uid : $self;
-}
+};
 
-# From IMAPClient.pm
-sub fetch_hash2 {
+
+
+
+*Mail::IMAPClient::fetch_hash = sub {
 	# taken from original lib, 
 	# just added split code.
         my $self = shift;
@@ -2110,14 +2160,13 @@ sub fetch_hash2 {
         }
 }
         return wantarray ? %$hash : $hash;
-}
+};
 
 
-# From IMAPClient.pm
 
-sub login2 {
+*Mail::IMAPClient::login = sub {
         my $self = shift;
-        return $self->authenticate2($self->Authmechanism,$self->Authcallback) 
+        return $self->authenticate($self->Authmechanism,$self->Authcallback) 
                 if $self->{Authmechanism};
 
         my $id   = $self->User;
@@ -2134,17 +2183,18 @@ sub login2 {
                 return undef;
         };
         return $self;
-}
+};
 
-# From IMAPClient.pm
 
-sub parse_headers2 {
+
+
+*Mail::IMAPClient::parse_headers = sub {
         my($self,$msgspec_all,@fields) = @_;
         my(%fieldmap) = map { ( lc($_),$_ )  } @fields;
         my $msg; my $string; my $field;
 	
 	unless(ref($msgspec_all) eq 'ARRAY') {
-		print "parse_headers2 want an ARRAY ref\n";
+		print "parse_headers want an ARRAY ref\n";
 		exit 1;
 	}
 	
@@ -2185,7 +2235,8 @@ sub parse_headers2 {
         my $h = 0;              # reference to hash of current msgid, or 0 between msgs
         
         for my $header (map { split(/(?:\x0d\x0a)/,$_) } @raw) {
-                local($^W) = undef;
+                
+		no warnings;
                 if ( $header =~ /^\*\s+\d+\s+FETCH\s+\(.*BODY\[HEADER(?:\]|\.FIELDS)/i) {
                         if ($self->Uid) {
                                 if ( my($msgid) = $header =~ /UID\s+(\d+)/ ) {
@@ -2222,9 +2273,12 @@ sub parse_headers2 {
                 if ($h != 0) {                    # do we expect this to be a header?
                         my $hdr = $header;
                         chomp $hdr;
-                        $hdr =~ s/\r$//;   
-                        if ($hdr =~ s/^(\S+):\s*//) { 
-                                $field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
+                        $hdr =~ s/\r$//;
+			#print "W[$hdr]\n";
+			
+                        if (defined($hdr) and $hdr =~ s/^(\S+):\s*//) {
+			        #print "X";
+				$field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
                                 push @{$h->{$field}} , $hdr ;
                         } elsif ($hdr =~ s/^.*FETCH\s\(.*BODY\[HEADER\.FIELDS.*\)\]\s(\S+):\s*//) { 
                                 $field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
@@ -2252,12 +2306,10 @@ sub parse_headers2 {
         
 	return $headers;
         
-}
+};
 
 
-# From IMAPClient.pm
-
-sub authenticate2 {
+*Mail::IMAPClient::authenticate = sub {
 
         my $self        = shift;
         my $scheme      = shift;
@@ -2304,10 +2356,10 @@ sub authenticate2 {
         if ('CRAM-MD5' eq $scheme && ! $response) {
           if ($Mail::IMAPClient::_CRAM_MD5_ERR) {
             $self->LastError($Mail::IMAPClient::_CRAM_MD5_ERR);
-            carp $Mail::IMAPClient::_CRAM_MD5_ERR if $^W;
+            carp $Mail::IMAPClient::_CRAM_MD5_ERR;
           } 
 	  else {
-            $response = \&_cram_md5_2;
+            $response = \&Mail::IMAPClient::_cram_md5;
           }
         }
 
@@ -2343,17 +2395,21 @@ sub authenticate2 {
         $code =~ /^OK/ and $self->State(Authenticated) ;
         return $code =~ /^OK/ ? $self : undef ;
 
-}
+};
 
-sub _cram_md5_2 {
+
+
+*Mail::IMAPClient::_cram_md5 = sub  {
   my ($code, $client) = @_;
   my $hmac = Digest::HMAC_MD5::hmac_md5_hex(MIME::Base64::decode($code),
                                             $client->Password());
   return MIME::Base64::encode($client->User() . " $hmac", "");
-}
+};
 
 
-sub connect2 {
+
+
+*Mail::IMAPClient::connect = sub {
 	my $self = shift;
 	
 	$self->Port(143) 
@@ -2382,15 +2438,16 @@ sub connect2 {
 	#print "i03\n";
 	$self->Socket($sock);
 	$self->State(Connected);
-
+	#print "i04\n";
 	$sock->autoflush(1)				;
 	
 	my ($code, $output);
         $output = "";
-
+	#print "i05\n";
         until ( $code ) {
 
                 $output = $self->_read_line or return undef;
+		#print "i06\n";
                 for my $o (@$output) {
 			$self->_debug("Connect: Received this from readline: " . 
 					join("/",@$o) . "\n");
@@ -2414,3 +2471,24 @@ sub connect2 {
 	}
 }
 	
+
+
+}
+
+package Mail::IMAPClient;
+
+
+sub Authuser {
+	my $self = shift;
+	
+	if (@_) { $self->{AUTHUSER} = shift }
+	return $self->{AUTHUSER};
+}
+
+
+sub Split {
+	my $self = shift;
+	
+	if (@_) { $self->{SPLIT} = shift }
+	return $self->{SPLIT};
+}
diff --git a/imapsync2 b/imapsync2
deleted file mode 100755
index 0bbc7c9..0000000
--- a/imapsync2
+++ /dev/null
@@ -1,2384 +0,0 @@
-#!/usr/bin/perl -w
-
-=pod
-
-=head1 NAME 
-
-imapsync - IMAP synchronisation, sync, copy or migration
-tool. Synchronise mailboxes between two imap servers. Good
-at IMAP migration. More than 32 different IMAP server softwares
-supported with success.
-
-$Revision: 1.235 $
-
-=head1 INSTALL
-
- imapsync works fine under any Unix OS with perl.
- imapsync works fine under Windows 2000 (at least) and ActiveState's 5.8 Perl
-
- imapsync is already available directly on the following distributions (at least):
- FreeBSD, Debian, Ubuntu, Gentoo, NetBSD, Darwin, Mandriva.
-
- Get imapsync at
- http://www.linux-france.org/prj/imapsync/dist/
-
- You'll find a compressed tarball called imapsync-x.xx.tgz
- where x.xx is the version number. Untar the tarball where
- you want (on Unix):
-
- tar xzvf  imapsync-x.xx.tgz
-
- Go into the directory imapsync-x.xx and read the INSTALL file.
- The INSTALL file is also at 
- http://www.linux-france.org/prj/imapsync/INSTALL (for windows users)
- 
- The freshmeat record is at http://freshmeat.net/projects/imapsync/
-
-=head1 SYNOPSIS
-
-  imapsync [options]
-
-To get a description of each option just run imapsync like this :
-
-  imapsync --help
-  imapsync
-
-The option list :
-
-  imapsync [--host1 server1]  [--port1 <num>]
-           [--user1 <string>] [--passfile1 <string>]
-           [--host2 server2]  [--port2 <num>]
-           [--user2 <string>] [--passfile2 <string>]
-           [--ssl1] [--ssl2]
-           [--authmech1 <string>] [--authmech2 <string>] 
-           [--noauthmd5]
-           [--folder <string> --folder <string> ...]
-           [--folderrec <string> --folderrec <string> ...]
-           [--include <regex>] [--exclude <regex>]
-           [--prefix2 <string>] [--prefix1 <string>] 
-           [--regextrans2 <regex> --regextrans2 <regex> ...]
-           [--sep1 <char>]
-           [--sep2 <char>]
-           [--justfolders] [--justfoldersizes] [--justconnect]
-           [--syncinternaldates]
-           [--buffersize  <int>]
-           [--syncacls]
-           [--regexmess <regex>] [--regexmess <regex>]
-           [--maxsize <int>]
-           [--maxage <int>]
-           [--minage <int>]
-           [--skipheader <regex>]
-           [--useheader <string>] [--useheader <string>]
-           [--skipsize]
-           [--delete] [--delete2]
-           [--expunge] [--expunge1] [--expunge2]
-           [--subscribed] [--subscribe]
-           [--nofoldersizes]
-           [--dry]
-           [--debug] [--debugimap]
-           [--timeout <int>] [--fast]
-           [--split1] [--split2] 
-           [--version] [--help]
-  
-=cut
-# comment
-
-=pod
-
-=head1 DESCRIPTION
-
-The command imapsync is a tool allowing incremental and
-recursive imap transfer from one mailbox to another. 
-
-By default all folders are transfered, recursively.
-
-We sometimes need to transfer mailboxes from one imap server to
-another. This is called migration.
-
-imapsync is the adequate tool because it reduces the amount
-of data transferred by not transferring a given message if it
-is already on both sides. Same headers, same message size
-and the transfer is done only once. All flags are
-preserved, unread will stay unread, read will stay read,
-deleted will stay deleted. You can stop the transfer at any
-time and restart it later, imapsync is adapted to a bad
-connection. imapsync is CPU hungry so nice and renice 
-commands can be a good help. imapsync can be memory hungry too,
-especially with large messages.
-
-You can decide to delete the messages from the source mailbox
-after a successful transfer (it is a good feature when migrating).
-In that case, use the --delete --expunge1 options.
-
-You can also just synchronize a mailbox A from another mailbox B
-in case you just want to keep a "live" copy of B in A.
-
-=head1 OPTIONS
-
-To get a description of each option just invoke: 
-
-imapsync --help
-
-=head1 HISTORY
-
-I wrote imapsync because an enterprise (basystemes) paid me to install
-a new imap server without loosing huge old mailboxes located on a far
-away remote imap server accessible by a low bandwith link. The tool
-imapcp (written in python) could not help me because I had to verify
-every mailbox was well transferred and delete it after a good
-transfer. imapsync started its life being a copy_folder.pl patch.
-The tool copy_folder.pl comes from the Mail-IMAPClient-2.1.3 perl
-module tarball source (in the examples/ directory of the tarball).
-
-=head1 EXAMPLE
-
-While working on imapsync parameters please run imapsync in
-dry mode (no modification induced) with the --dry
-option. Nothing bad can be done this way.
-
-To synchronize the imap account "buddy" on host
-"imap.src.fr" to the imap account "max" on host
-"imap.dest.fr" (the passwords are located in two files
-"/etc/secret1" for "buddy", "/etc/secret2" for "max") :
-
- imapsync --host1 imap.src.fr  --user1 buddy --passfile1 /etc/secret1 \
-          --host2 imap.dest.fr --user2 max   --passfile2 /etc/secret2
-
-Then, you will have max's mailbox updated from buddy's
-mailbox.
-
-=head1 SECURITY
-
-You can use --password1 instead of --passfile1 to give the
-password but it is dangerous because any user on your host
-can see the password by using the 'ps auxwwww'
-command. Using a variable (like $PASSWORD1) is also
-dangerous because of the 'ps auxwwwwe' command. So, saving
-the password in a well protected file (600 or rw-------) is
-the best solution.
-
-imasync is not totally protected against sniffers on the
-network since passwords may be transferred in plain text in
-case CRAM-MD5 is not supported by your imap servers.  Use
---ssl1 and --ssl2 to enable encryption on host1 and host2.
-
-You may authenticate as one user (typically an admin user),
-but be authorized as someone else, which means you don't
-need to know every user's personal password.  Specify
---authuser1 "adminuser" to enable this on host1.  In this
-case, --authmech1 PLAIN will be used by default since it
-is the only way to go for now. So don't use --authmech1 SOMETHING
-with --authuser1 "adminuser", it will not work.
-Same behavior with the --authuser2 option.
-
-
-=head1 EXIT STATUS
-
-imapsync will exit with a 0 status (return code) if everything went good.
-Otherwise, it exits with a non-zero status.
-
-So if you have a buggy internet connection, you can use this loop 
-in a Bourne shell:
-
-        while ! imapsync ...; do 
-              echo imapsync not complete
-        done
-
-=head1 AUTHOR
-
-Gilles LAMIRAL <lamiral@linux-france.org>
-
-Feedback good or bad is always welcome.
-
-The newsgroup comp.mail.imap is a good place to talk about
-imapsync. I read it when imapsync is concerned.
-
-Gilles LAMIRAL earn his living writing, installing,
-configuring and teaching free open and gratis
-softwares. Do not hesitate to pay him for that services.
-
-
-=head1 LICENSE
-
-imapsync is free, gratis and open source software cover by
-the GNU General Public License. See the GPL file included in
-the distribution or the web site
-http://www.gnu.org/licenses/licenses.html
-
-=head1 BUGS
-
-No known serious bug.  Report any bug to the author.
-Before reporting bugs, read the FAQ, this README and the
-TODO files.
-
-In your report, please include:
-
- - imapsync version.
- - IMAPClient.pm version.
- - perl version.
- - operating system running imapsync.
- - imap servers softwares on both side and their version.
-
- Those values can be found with the command line
-
- imapsync --host1 imap.host1.net  --host2 imap.host2.org  --justconnect
-
- And also, if it can help :
-
- - operating systems on both sides and the third side in case
-   you run imapsync on a foreign host from the both.
- - imapsync with all the options you use,  the full command line
-   you use (except the passwords of course). This can be found
-   at the beginning of the output.
- - output given with --debug --debugimap near the failure point.
-
-=head1 IMAP SERVERS
-
-Failure stories reported with the following 4 imap servers :
-
- - MailEnable 1.54 (Proprietary) http://www.mailenable.com/
- - DBMail 0.9, 2.0.7 (GPL). But DBMail 1.2.1 works.
-   Patient and confident testers are welcome.
- - dkimap4 2.39
- - Imail 7.04 (maybe).
-
-Success stories reported with the following 34 imap servers 
-(softwares names are in alphabetic order) : 
-
- - BincImap 1.2.3 (GPL) (http://www.bincimap.org/)
- - CommuniGatePro server (Redhat 8.0)
- - Courier IMAP 1.5.1, 2.2.0, 2.1.1, 2.2.1, 3.0.8 (GPL) 
-   (http://www.courier-mta.org/)
- - Critical Path (7.0.020)
- - Cyrus IMAP 1.5, 1.6, 2.1, 2.1.15, 2.1.16, 2.1.18 
-   2.2.1, 2.2.2-BETA, 2.2.10, 2.2.12, 
-   v2.2.3-Invoca-RPM-2.2.3-8,
-   2.3-alpha (OSI Approved),
-   v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1,
-   2.2.13,
-   v2.3.1-Invoca-RPM-2.3.1-2.7.fc5,
-   (http://asg.web.cmu.edu/cyrus/)
- - David Tobit V8 (proprietary Message system).
- - DBMail 1.2.1, 2.0.4, 2.0.9, 2.2rc1 (GPL) (http://www.dbmail.org/).
-   2.0.7 seems buggy.
- - Deerfield VisNetic MailServer 5.8.6 [from]
- - Dovecot 0.99.10.4, 0.99.14, 0.99.14-8.fc4, 1.0-0.beta2.7, 
-   1.0.0 [dest] (LGPL) (http://www.dovecot.org/)
- - Domino (Notes) 6.5, 5.0.6, 5.0.7, 7.0.2, 6.0.2CF1, 7.0.1 [from]
- - Eudora WorldMail v2
- - GMX IMAP4 StreamProxy.
- - Groupwise IMAP (Novell) 6.x and 7.0. Buggy so see the FAQ.
- - iPlanet Messaging server 4.15, 5.1, 5.2
- - IMail 7.15 (Ipswitch/Win2003), 8.12
- - MDaemon 7.0.1, 8.1, 9.5.4 (Windows server 2003 R2 platform)
- - Mercury 4.1 (Windows server 2000 platform)
- - Microsoft Exchange Server 5.5, 6.5.7638.1 [dest]
- - Netscape Mail Server 3.6 (Wintel !)
- - Netscape Messaging Server 4.15 Patch 7
- - OpenMail IMAP server B.07.00.k0 (Samsung Contact ?)
- - OpenWave
- - Qualcomm Worldmail (NT)
- - Rockliffe Mailsite 5.3.11
- - Samsung Contact IMAP server 8.5.0
- - Scalix v10.1, 10.0.1.3, 11.0.0.431
- - SmarterMail
- - SunONE Messaging server 5.2, 6.0 (SUN JES - Java Enterprise System)
- - Sun Java System Messaging Server 6.2-2.05
- - Surgemail 3.6f5-5
- - UW-imap servers (imap-2000b) rijkkramer IMAP4rev1 2000.287
-   (RedHat uses UW like 2003.338rh), v12.264 Solaris 5.7 (OSI Approved) 
-   (http://www.washington.edu/imap/)
- - UW - QMail v2.1
- - Imap part of TCP/IP suite of VMS 7.3.2
- - Zimbra-IMAP 3.0.1 GA 160, 3.1.0 Build 279, 4.0.5, 4.5.2, 5.5.
-
-Please report to the author any success or bad story with
-imapsync and don't forget to mention the IMAP server
-software names and version on both sides. This will help
-future users. To help the author maintaining this section
-report the two lines at the begining of the output if they
-are useful to know the softwares. Example:
-
- From software :* OK louloutte Cyrus IMAP4 v1.5.19 server ready
- To   software :* OK Courier-IMAP ready
-
-You can use option --justconnect to get those lines.
-Example :
-
-  imapsync --host1 imap.troc.org --host2 imap.trac.org --justconnect
-
-Please rate imapsync at http://freshmeat.net/projects/imapsync/
-or better give the author a book, he likes books:
-http://www.amazon.com/gp/registry/wishlist/1C9UNDIH3P7R7/
-(or its paypal account gilles.lamiral@laposte.net)
-
-=head1 HUGE MIGRATION
-
-
-Have a special attention on options 
---subscribed
---subscribe
---delete
---delete2
---expunge
---expunge1
---expunge2
---maxage
---minage
---maxsize
---useheader
-
-If you have many mailboxes to migrate think about a little
-shell program. Write a file called file.csv (for example)
-containing users and passwords.
-The separator used in this example is ';'
-
-The file.csv file content is :
-
-user0001;password0001;user0002;password0002
-user0011;password0011;user0012;password0012
-...
-
-And the shell program is just :
-
- { while IFS=';' read  u1 p1 u2 p2; do 
-	imapsync --user1 "$u1" --password1 "$p1" --user2 "$u2" --password2 "$p2" ...
- done ; } < file.csv
-
-Welcome in shell programming !
-
-=head1 Hacking
-
-Feel free to hack imapsync as the GPL Licence permits it.
-
-=head1 Links
-
-Entries for imapsync:
-  http://www.imap.org/products/showall.php
-
-
-=head1 SIMILAR SOFTWARES
-
-  imap_tools    : http://www.athensfbc.com/imap_tools
-  offlineimap   : http://software.complete.org/offlineimap
-  mailsync      : http://mailsync.sourceforge.net/
-  imapxfer      : http://www.washington.edu/imap/
-                   part of the imap-utils from UW.
-  mailutil      : replace imapxfer in 
-                   part of the imap-utils from UW.
-                  http://www.gsp.com/cgi-bin/man.cgi?topic=mailutil
-  imaprepl      : http://www.bl0rg.net/software/
-                  http://freshmeat.net/projects/imap-repl/
-  imap_migrate  : http://freshmeat.net/projects/imapmigration/
-  imapcopy      : http://home.arcor.de/armin.diehl/imapcopy/imapcopy.html
-  migrationtool : http://sourceforge.net/projects/migrationtool/
-  imapmigrate   : http://sourceforge.net/projects/cyrus-utils/
-  wonko_imapsync: http://wonko.com/article/554
-  pop2imap      : http://www.linux-france.org/prj/pop2imap/
-
-
-Feedback (good or bad) will be always welcome.
-
-$Id: imapsync,v 1.235 2007/11/10 02:52:29 gilles Exp gilles $
-
-
-
-=cut
-
-
-++$|;
-use strict;
-use Getopt::Long;
-use Mail::IMAPClient;
-use Digest::MD5  qw(md5_base64);
-#use Term::ReadKey;
-#use IO::Socket::SSL;
-use MIME::Base64;
-use English;
-use POSIX qw(uname);
-use Fcntl;
-
-#use Test::Simple tests => 1;
-use Test::More 'no_plan';
-
-eval { require 'usr/include/sysexits.ph' };
-
-
-my(
-        $rcs, $debug, $debugimap, $error,
-	$host1, $host2, $port1, $port2,
-	$user1, $user2, $password1, $password2, $passfile1, $passfile2,
-        @folder, @include, @exclude, @folderrec,
-        $prefix1, $prefix2, 
-        @regextrans2, @regexmess, @regexflag, 
-        $sep1, $sep2,
-	$syncinternaldates, $syncacls,
-        $fastio1, $fastio2, 
-	$maxsize, $maxage, $minage, 
-        $skipheader, @useheader,
-        $skipsize, $foldersizes, $buffersize,
-	$delete, $delete2,
-        $expunge, $expunge1, $expunge2, $dry,
-        $justfoldersizes,
-        $authmd5,
-        $subscribed, $subscribe,
-	$version, $VERSION, $help, 
-        $justconnect, $justfolders,
-        $fast,
-        $mess_size_total_trans,
-        $mess_size_total_skipped,
-        $mess_size_total_error,
-        $mess_trans, $mess_skipped, $mess_skipped_dry, 
-        $timeout,   # whr (ESS/PRW)
-	$timestart, $timeend, $timediff,
-        $timesize, $timebefore,
-        $ssl1, $ssl2,
-        $authuser1, $authuser2,
-        $authmech1, $authmech2,
-        $split1, $split2,
-	$tests,
-);
-
-use vars qw ($opt_G); # missing code for this will be option.
-
-
-$rcs = ' $Id: imapsync,v 1.235 2007/11/10 02:52:29 gilles Exp gilles $ ';
-$rcs =~ m/,v (\d+\.\d+)/;
-$VERSION = ($1) ? $1 : "UNKNOWN";
-
-my $VERSION_IMAPClient = $Mail::IMAPClient::VERSION;
-
-#check_lib_version() or 
-#  die "Upgrade perl lib Mail::IMAPClient to release 2.2.9 at least\n";
-
-
-$mess_size_total_trans   = 0;
-$mess_size_total_skipped = 0;
-$mess_size_total_error   = 0;
-$mess_trans = $mess_skipped = $mess_skipped_dry = 0;
-
-
-sub check_lib_version {
-	# I know this is ugly, I should write a sort function
-	if ($VERSION_IMAPClient =~ m/(\d+)\.(\d+)\.(\d+)/) {
-		$debug and print "VERSION_IMAPClient $1 $2 $3\n";
-		my($major,$minor,$sub) = ($1, $2, $3);
-		
-		return(1) if($major >=3);
-		return(0) if($major <=1);
-		return(1) if($minor >=3);
-		return(0) if($minor <=1);
-		return(1) if($sub >=8);
-		return(0) if($sub <=7);
-	}
-	else{
-		return 0; # don't match regex => bad
-	}
-}
-
-$error=0;
-
-my $banner = join("", 
-		  '$RCSfile: imapsync,v $ ',
-		  '$Revision: 1.235 $ ',
-		  '$Date: 2007/11/10 02:52:29 $ ',
-		  "\n",localhost_info(),
-		  " and the module Mail::IMAPClient version used here is ",
-		  $VERSION_IMAPClient,"\n",
-		  "Command line used :\n",
-		  "$0 @ARGV\n",
-		 );
-
-unless(defined(&_SYSEXITS_H)) {
-	# 64 on my linux box.
-	eval 'sub EX_USAGE () {64;}' unless defined(&EX_USAGE);
-}
-
-get_options();
-print $banner;
-
-sub missing_option {
-	my ($option) = @_;
-	die "$option option must be used, run $0 --help for help\n";
-}
-
-# By default, 1000 at a time, not more.
-$split1 ||= 1000;
-$split2 ||= 1000;
-
-$host1 || missing_option("--host1") ;
-# $port1 = (defined($port1)) ? $port1 : 143;
-$port1 ||= defined $ssl1 ? 993 : 143;
-
-$host2 || missing_option("--host2") ;
-# $port2 = (defined($port2)) ? $port2 : 143;
-$port2 ||= defined $ssl2 ? 993 : 143;
-
-sub connect_imap {
-	my($host, $port, $debugimap) = @_;
-	my $imap = Mail::IMAPClient->new();
-	$imap->Server($host);
-	$imap->Port($port);
-	$imap->Debug($debugimap);
-	$imap->connect()
-	  or die "Can not open imap connection on [$host] : $@\n";	
-}
-
-sub localhost_info {
-	
-	my($infos) = join("", 
-	"Here is a [$OSNAME] system (", 
-	join(" ", 
-	     uname(),
-	),
-        ")\n",
-	"with perl ", 
-	sprintf("%vd", $PERL_VERSION));		  
-	return($infos);
-
-}
-
-if ($justconnect) {
-	my $from = ();
-	my $to = ();
-	
-	$from = connect_imap($host1, $port1);
-	print "From software : ", server_banner($from);
-	print "From capability : ", join(" ", $from->capability()), "\n";
-	$to   = connect_imap($host2, $port2);
-	print "To   software : ", server_banner($to);
-	print "To   capability : ", join(" ", $to->capability()), "\n";
-	$from->logout();
-	$to->logout();
-	exit(0);
-}
-
-$user1 || missing_option("--user1");
-$user2 || missing_option("--user2");
-
-if(defined($authmd5) and not($authmd5)) {
-	$authmech1 ||= 'LOGIN';
-	$authmech2 ||= 'LOGIN';
-}
-else{
-	$authmech1 ||= $authuser1 ? 'PLAIN' : 'CRAM-MD5';
-	$authmech2 ||= $authuser2 ? 'PLAIN' : 'CRAM-MD5';
-}
-
-$authmech1 = uc($authmech1);
-$authmech2 = uc($authmech2);
-
-$authuser1 ||= $user1;
-$authuser2 ||= $user2;
-
-print "will try to use $authmech1 authentication on host1\n";
-print "will try to use $authmech2 authentication on host2\n";
-
-$syncacls = (defined($syncacls)) ? $syncacls : 0;
-$foldersizes = (defined($foldersizes)) ? $foldersizes : 1;
-
-$fastio1 = (defined($fastio1)) ? $fastio1 : 0;
-$fastio2 = (defined($fastio2)) ? $fastio2 : 0;
-
-
-@useheader = ("ALL") unless (@useheader);
-
-print "From imap server [$host1] port [$port1] user [$user1]\n";
-print "To   imap server [$host2] port [$port2] user [$user2]\n";
-
-
-sub ask_for_password {
-	require Term::ReadKey;
-	my ($user, $host) = @_;
-	print "What's the password for $user\@$host? ";
-	Term::ReadKey::ReadMode(2);
-	my $password = <>;
-	chomp $password;
-	printf "\n";
-	Term::ReadKey::ReadMode(0);
-	return $password;
-}
-
-
-$password1 || $passfile1 || do {
-	$password1 = ask_for_password($authuser1 || $user1, $host1);
-};
-
-$password1 = (defined($passfile1)) ? firstline ($passfile1) : $password1;
-
-$password2 || $passfile2 || do {
-	$password2 = ask_for_password($authuser2 || $user2, $host2);
-};
-
-$password2 = (defined($passfile2)) ? firstline ($passfile2) : $password2;
-
-my $from = ();
-my $to = ();
-
-$timestart = time();
-$timebefore = $timestart;
-
-$debugimap and print "From connection\n";
-$from = login_imap($host1, $port1, $user1, $password1, 
-		   $debugimap, $timeout, $fastio1, $ssl1, 
-		   $authmech1, $authuser1);
-
-$debugimap and print "To  connection\n";
-$to = login_imap($host2, $port2, $user2, $password2, 
-		 $debugimap, $timeout, $fastio2, $ssl2, 
-		 $authmech2, $authuser2);
-
-#  history
-
-$debug and print "From Buffer I/O : ", $from->Buffer(), "\n";
-$debug and print "To   Buffer I/O : ", $to->Buffer(), "\n";
-
-
-sub login_imap {
-	my($host, $port, $user, $password, 
-	   $debugimap, $timeout, $fastio, 
-	   $ssl, $authmech, $authuser) = @_;
-	my ($imap);
-	if ($ssl) {
-		require IO::Socket::SSL;
-		my $socssl = new IO::Socket::SSL("$host:$port");
-		die "Error connecting to $host:$port: $@\n" unless $socssl;
-		$socssl->autoflush(1);
-		
-		$imap = Mail::IMAPClient->new(
-					      Socket => $socssl,
-					      Server => $host,
-					     );
-	} 
-	else {
-		$imap = Mail::IMAPClient->new();
-	}
-	$imap->Clear(20);
-	$imap->Server($host);
-	$imap->Port($port);
-	$imap->Fast_io($fastio);
-	$imap->Buffer($buffersize || 4096);
-	$imap->Uid(1);
-	$imap->Peek(1);
-	$imap->Debug($debugimap);
-	$timeout and $imap->Timeout($timeout);
-	
-	if ($ssl) {
-		$imap->State(Mail::IMAPClient::Connected);
-	} 
-	else {
-		$imap->connect()
-	  or die "Can not open imap connection on [$host] with user [$user] : $@\n";
-	}
-	print "Banner : ", server_banner($imap);
-	
-	if ($imap->has_capability("AUTH=$authmech")
-	    or $imap->has_capability($authmech)
-	   ) {
-		printf("Host %s says it has CAPABILITY for AUTHENTICATE %s\n",
-		       $imap->Server, $authmech);
-	} 
-	else {
-		printf("Host %s says it has NO CAPABILITY for AUTHENTICATE %s\n",
-		       $imap->Server, $authmech);
-		if ($authmech eq 'PLAIN') {
-			print "Frequently PLAIN is only supported with SSL, ",
-			  "try --ssl1 or --ssl2 option\n";
-		}
-	}
-	
-	$imap->Authmechanism($authmech) unless ($authmech eq 'LOGIN');
-	$imap->Authcallback(\&plainauth) if $authmech eq "PLAIN";
-
-	$imap->User($user);
-	$imap->Authuser($authuser);
-	$imap->Password($password);
-	unless ($imap->login()) {
-		print "Error login : [$host] with user [$user] auth [$authmech]: $@\n";
-		die if ($authmech eq 'LOGIN');
-		die if $imap->IsUnconnected();
-		print "Trying LOGIN Auth mechanism on [$host] with user [$user]\n";
-		$imap->Authmechanism("");
-		$imap->login() or
-		  die "Error login : [$host] with user [$user] auth [LOGIN] : $@";
-	}
-	print "Success login on [$host] with user [$user] auth [$authmech]\n";
-	return($imap);
-}
-
-sub plainauth() {
-        my $code = shift;
-        my $imap = shift;
-
-        my $string = sprintf("%s\x00%s\x00%s", $imap->User,
-                            $imap->Authuser, $imap->Password);
-        return encode_base64("$string", "");
-}
-
-
-sub server_banner {
-	my $imap = shift;
-	for my $line ($imap->Results()) {
-		#print "LR: $line";
-		return $line if $line =~ /^\* (OK|NO|BAD)/;
-        }
-	return "No banner\n";
- }
-
-
-
-print "From capability : ", join(" ", $from->capability()), "\n";
-print "To   capability : ", join(" ", $to->capability()), "\n";
-
-die unless $from->IsAuthenticated();
-print "From state Authenticated\n";
-die unless   $to->IsAuthenticated();
-print "To   state Authenticated\n";
-
-$split1 and $from->Split($split1);
-$split2 and $to->Split($split2);
-
-# 
-# Folder stuff
-#
-
-my (@f_folders, %requested_folder, @t_folders, %subscribed_folder, %t_folders);
-
-sub tests_folder_routines {
-	ok( !give_requested_folders()                ,"no requested folders"  );
-	ok( !is_requested_folder('folder_foo')                                );
-	ok(  add_to_requested_folders('folder_foo')                           );
-	ok(  is_requested_folder('folder_foo')                                );
-	ok( !is_requested_folder('folder_NO_EXIST')                           );
-	ok( !remove_from_requested_folders('folder_foo'), "removed folder_foo");
-	ok( !is_requested_folder('folder_foo')                                );
-	my @f;
-	ok(  @f = add_to_requested_folders('folder_bar', 'folder_toto'), "add result: @f");
-	ok(  is_requested_folder('folder_bar')                                );
-	ok(  is_requested_folder('folder_toto')                               );
-	ok(  remove_from_requested_folders('folder_toto')                     );
-	ok( !is_requested_folder('folder_toto')                               );
-	ok( init_requested_folders()                 , 'empty requested folders');
-	ok( !give_requested_folders()                , 'no requested folders'  );
-}
-
-sub give_requested_folders {
-	return(keys(%requested_folder));
-}
-
-sub init_requested_folders {
-	
-	%requested_folder = ();
-	return(1);
-	
-}
-
-sub is_requested_folder {
-	my ( $folder ) = @_;
-	
-	defined( $requested_folder{ $folder } );
-}
-
-
-sub add_to_requested_folders {
-	my @wanted_folders = @_;
-	
-	foreach my $folder ( @wanted_folders ) {
-	 	++$requested_folder{ $folder };
-	}
-	return( keys( %requested_folder ) );
-}
-
-sub remove_from_requested_folders {
-	my @wanted_folders = @_;
-	
-	foreach my $folder (@wanted_folders) {
-	 	delete $requested_folder{$folder};
-	}
-	return( keys(%requested_folder) );
-}
-
-
-# Make a hash of subscribed folders in source server.
-map { $subscribed_folder{$_} = 1 } $from->subscribed();
-
-
-my @all_source_folders = sort $from->folders();
-
-if (scalar(@folder) or $subscribed or scalar(@folderrec)) {
-	# folders given by option --folder
-	if (scalar(@folder)) {
-		push(@f_folders, @folder);
-		add_to_requested_folders(@folder);
-	}
-	
-	# option --subscribed
-	if ($subscribed) {
-		push(@f_folders,    sort keys (%subscribed_folder));
-		add_to_requested_folders(keys (%subscribed_folder));
-	}
-	
-	# option --folderrec
-	if (scalar(@folderrec)) {
-		foreach my $folderrec (@folderrec) {
-			push(@f_folders, $from->folders($folderrec));
-			add_to_requested_folders($from->folders($folderrec));
-		}
-	}
-	@f_folders = sort @f_folders;
-}
-else {
-	# no folder/subscribed/folderrec options => all folders
-	@f_folders = @all_source_folders;
-}
-
-# consider (optional) includes and excludes
-if (scalar(@include)) {
-	my @f_folders_inc;
-	
-	foreach my $include (@include) {
-		my @included_folders = grep /$include/, @all_source_folders;
-		push(@f_folders_inc, @included_folders);
-		add_to_requested_folders(@included_folders);
-		print "Including folders matching pattern '$include': @included_folders\n";
-	}
-	# the following is a bug when no folder/subscribed/folderrec options
-	push(@f_folders, sort @f_folders_inc);
-}
-
-foreach my $exclude (@exclude) {
-	my @excluded_folders = grep /$exclude/, @f_folders;
-	remove_to_requested_folders(@excluded_folders);
-	my @not_excluded_folders = grep !/$exclude/,@f_folders;
-	@f_folders = @not_excluded_folders;
-	print "Excluding folders matching pattern '$exclude': @excluded_folders\n";
-}
-
-
-sub compare_lists {
-	my ($list_1_ref, $list_2_ref) = @_;
-	
-	
-	return(0) if (! $list_1_ref); # end if no list
-	return(1) if (! $list_2_ref); # end if only one list
-	
-	my $last_used_indice = 0;
-	ELEMENT:
-	foreach my $indice ( 0 .. $#$list_1_ref ) {
-		$last_used_indice = $indice;
-		
-		# End of list_2
-		return 1 if ($indice > $#$list_2_ref);
-		
-		my $element_list_1 = $list_1_ref->[$indice];
-		my $element_list_2 = $list_2_ref->[$indice];
-		my $balance = $element_list_1 cmp $element_list_2 ;
-		next ELEMENT if ($balance == 0) ;
-		return $balance;
-	}
-	# each element equal until last indice of list_1
-	return -1 if ($last_used_indice < $#$list_2_ref);
-	
-	# same size, each element equal
-	return 0
-}
-
-sub tests_compare_lists {
-
-	
-	my $empty_list_ref = [];
-	
-	ok( 0 == compare_lists()               ,'compare_lists, no args');
-	ok(-1 == compare_lists(undef , $empty_list_ref), 'compare_lists, no first arg, second empty list');
-	ok(+1 == compare_lists($empty_list_ref), 'compare_lists, first arg empty list');
-	ok( 0 == compare_lists($empty_list_ref , $empty_list_ref), 'compare_lists, two empty lists');
-	ok( 0 == compare_lists([1,2], [1,2])   , "compare_lists, two 1 2 lists") ;
-	ok(-1 == compare_lists([1], [1,2])     , "compare_lists, [1] < [1,2]") ;
-	ok(+1 == compare_lists([1, 1], [1])    , "compare_lists, [1, 1] > [1]") ;
-	ok( 0 == compare_lists([1 .. 20_000]   , [1 .. 20_000]), "compare_lists, two 1 .. 20_000 lists") ;
-	ok(-1 == compare_lists([1], [3])       , 'compare_lists, [1] < [3]') ;
-	ok( 0 == compare_lists([2], [2])       , 'compare_lists, [0] = [2]') ;
-	ok(+1 == compare_lists([3], [1])       , 'compare_lists, [3] > [1]') ;
-	ok(-1 == compare_lists(["a"], ["b"])   , 'compare_lists, ["a"] < ["b"]') ;
-	ok( 0 == compare_lists(["a"], ["a"])   , 'compare_lists, ["a"] = ["a"]') ;
-	ok(+1 == compare_lists(["b"], ["a"])   , 'compare_lists, ["b"] > ["a"]') ;
-	ok(-1 == compare_lists(["a"], ["aa"])   , 'compare_lists, ["a"] < ["aa"]') ;
-	ok(-1 == compare_lists(["a"], ["a", "a"])   , 'compare_lists, ["a"] < ["a", "a"]') ;
-}
-
-
-@t_folders = sort @{$to->folders()};
-
-my($f_sep,$t_sep); 
-# what are the private folders separators for each server ?
-
-
-$debug and print "Getting separators\n";
-$f_sep = get_separator($from, $sep1, "--sep1");
-$t_sep = get_separator($to, $sep2, "--sep2");
-
-#my $f_namespace = $from->namespace();
-#my $t_namespace = $to->namespace();
-#$debug and print "From namespace:\n", Data::Dumper->Dump([$f_namespace]);
-#$debug and print "To   namespace:\n", Data::Dumper->Dump([$t_namespace]);
-
-my($f_prefix,$t_prefix); 
-$f_prefix = get_prefix($from, $prefix1, "--prefix1");
-$t_prefix = get_prefix($to, $prefix2, "--prefix2");
-
-sub get_prefix {
-	my($imap, $prefix_in, $prefix_opt) = @_;
-	my($prefix_out);
-	
-	$debug and print "Getting prefix namespace\n";
-	if (defined($prefix_in)) {
-		print "Using [$prefix_in] given by $prefix_opt\n";
-		$prefix_out = $prefix_in;
-		return($prefix_out);
-	}
-	$debug and print "Calling namespace capability\n";
-	if ($imap->has_capability("namespace")) {
-		my $r_namespace = $imap->namespace();
-		$prefix_out = $r_namespace->[0][0][0];
-		return($prefix_out);
-	}
-	else{
-		print 
-		  "No NAMESPACE capability in imap server ", 
-		    $imap->Server(),"\n",
-		      "Give the prefix namespace with the $prefix_opt option\n";
-		exit(1);
-	}
-}
-
-
-sub get_separator {
-	my($imap, $sep_in, $sep_opt) = @_;
-	my($sep_out);
-	
-	
-	if ($sep_in) {
-		print "Using [$sep_in] given by $sep_opt\n";
-		$sep_out = $sep_in;
-		return($sep_out);
-	}
-	$debug and print "Calling namespace capability\n";
-	if ($imap->has_capability("namespace")) {
-		$sep_out = $imap->separator();
-		return($sep_out);
-	}
-	else{
-		print 
-		  "No NAMESPACE capability in imap server ", 
-		    $imap->Server(),"\n",
-		      "Give the separator caracter with the $sep_opt option\n";
-		exit(1);
-	}
-}
-
-
-print "From separator and prefix : [$f_sep][$f_prefix]\n";
-print "To   separator and prefix : [$t_sep][$t_prefix]\n";
-
-
-sub foldersizes {
-
-	my ($side, $imap, $folders_r) = @_;
-	my $tot = 0;
-	my $tmess = 0;
-	my @folders = @{$folders_r};
-	print "++++ Calculating sizes ++++\n";
-	foreach my $folder (@folders)     {
-		my $stot = 0;
-		my $smess = 0;
-		printf("$side Folder %-35s", "[$folder]");
-		unless($imap->exists($folder)) {
-			print("does not exist yet\n");
-			next;
-		}
-		unless ($imap->select($folder)) {
-			warn 
-			  "$side Folder $folder : Could not select ",
-			    $imap->LastError,  "\n";
-			$error++;
-			next;
-		}
-		if (defined($maxage) or defined($minage)) {
-			# The pb is fetch_hash() can only be applied on ALL messages
-			my @msgs = select_msgs($imap);
-			$smess = scalar(@msgs);
-			foreach my $m (@msgs) {
-				my $s = $imap->size($m)
-				  or warn "Could not find size of message $m: $@\n";
-				$stot += $s;
-			}
-		}
-		else{
-			my $hashref = {};
-			$smess = $imap->message_count();
-			unless ($smess == 0) {
-				#$imap->Ranges(1);
-				$imap->fetch_hash("RFC822.SIZE",$hashref) or die "$@";
-				#$imap->Ranges(0);
-				#print map {$hashref->{$_}->{"RFC822.SIZE"}, " "} keys %$hashref;
-				map {$stot += $hashref->{$_}->{"RFC822.SIZE"}} keys %$hashref;
-			}
-		}
-		printf(" Size: %9s", $stot);
-		printf(" Messages: %5s\n", $smess);
-		$tot += $stot;
-		$tmess += $smess;
-	}
-	print "Total size: $tot\n";
-	print "Total messages: $tmess\n";
-	print "Time : ", timenext(), " s\n";
-}
-
-
-foreach my $f_fold (@f_folders) {
-	my $t_fold;
-	$t_fold = to_folder_name($f_fold);
-	$t_folders{$t_fold}++;
-}
-
-@t_folders = sort keys(%t_folders);
-
-
-if ($foldersizes) {
-	foldersizes("From", $from, \@f_folders);
-	foldersizes("To  ", $to,   \@t_folders);
-}
-
-
-
-
-sub timenext {
-	my ($timenow, $timerel);
-	# $timebefore is global, beurk !
-	$timenow    = time;
-	$timerel    = $timenow - $timebefore;
-	$timebefore = $timenow;
-	return($timerel);
-}
-
-exit if ($justfoldersizes);
-
-# needed for setting flags
-my $tohasuidplus = $to->has_capability("UIDPLUS");
-
-
-
-print 
-  "++++ Listing folders ++++\n",
-  "From folders list : ", map("[$_] ",@f_folders),"\n",
-  "To   folders list : ", map("[$_] ",@t_folders),"\n";
-
-print 
-  "From subscribed folders list : ", 
-  map("[$_] ", sort keys(%subscribed_folder)), "\n" 
-  if ($subscribed);
-
-sub separator_invert {
-	# The separator we hope we'll never encounter
-	my $o_sep="\000";
-
-	my($f_fold, $f_sep, $t_sep) = @_;
-
-	my $t_fold = $f_fold;
-	$t_fold =~ s@\Q$t_sep@$o_sep@g;
-	$t_fold =~ s@\Q$f_sep@$t_sep@g;
-	$t_fold =~ s@\Q$o_sep@$f_sep@g;
-	return($t_fold);
-}
-
-sub to_folder_name {
-	my ($t_fold);
-	my ($x_fold) = @_;
-	# first we remove the prefix
-	$x_fold =~ s/^$f_prefix//;
-	$debug and print "removed source prefix : [$x_fold]\n";
-	$t_fold = separator_invert($x_fold,$f_sep, $t_sep);
-	$debug and print "inverted   separators : [$t_fold]\n";
-	# Adding the prefix supplied by namespace or the --prefix2 option
-	$t_fold = $t_prefix . $t_fold 
-	  unless(($t_prefix eq "INBOX.") and ($t_fold =~ m/^INBOX$/i));
-	$debug and print "added   target prefix : [$t_fold]\n";
-
-	# Transforming the folder name by the --regextrans2 option(s)
-	foreach my $regextrans2 (@regextrans2) {
-		$debug and print "eval \$t_fold =~ $regextrans2\n";
-		eval("\$t_fold =~ $regextrans2");
-	}
-	return($t_fold);
-}
-
-sub flags_regex {
-	my ($flags_f) = @_;
-	foreach my $regexflag (@regexflag) {
-		$debug and print "eval \$flags_f =~ $regexflag\n";
-		eval("\$flags_f =~ $regexflag");
-	}
-	return($flags_f);
-}
-
-sub acls_sync {
-	my($f_fold, $t_fold) = @_;
-	if ($syncacls) {
-		my $f_hash = $from->getacl($f_fold)
-		  or warn "Could not getacl for $f_fold: $@\n";
-		my $t_hash = $to->getacl($t_fold)
-		  or warn "Could not getacl for $t_fold: $@\n";
-		my %users = map({ ($_, 1) } (keys(%$f_hash), keys(%$t_hash)));
-		foreach my $user (sort(keys(%users))) {
-			my $acl = $f_hash->{$user} || "none";
-			print "acl $user : [$acl]\n";
-			next if ($f_hash->{$user} && $t_hash->{$user} &&
-				 $f_hash->{$user} eq $t_hash->{$user});
-			unless ($dry) {
-				print "setting acl $t_fold $user $acl\n";
-				$to->setacl($t_fold, $user, $acl)
-				  or warn "Could not set acl: $@\n";
-			}
-		}
-	}
-}
-
-
-print "++++ Looping on each folder ++++\n";
-
-FOLDER: foreach my $f_fold (@f_folders) {
-	my $t_fold;
-	print "From Folder [$f_fold]\n";
-	$t_fold = to_folder_name($f_fold);
-	print "To   Folder [$t_fold]\n";
-
-	last FOLDER if $from->IsUnconnected();
-	last FOLDER if   $to->IsUnconnected();
-	
-	unless ($from->select($f_fold)) {
-		warn 
-		"From Folder $f_fold : Could not select ",
-		$from->LastError,  "\n";
-		$error++;
-		next FOLDER;
-	}
-
-	unless ($to->exists($t_fold) or $to->select($t_fold)) { 
-		print "To   Folder $t_fold does not exist\n";
-		print "Creating folder [$t_fold]\n";
-		unless ($dry){
-			unless ($to->create($t_fold)){
-				warn "Couldn't create [$t_fold]",
-				$to->LastError,"\n";
-				$error++;
-				next FOLDER;
-			}
-		}
-		else{
-			next FOLDER;
-		}
-	}
-	
-	acls_sync($f_fold, $t_fold);
-
-	unless ($to->select($t_fold)) { 
-		warn 
-		"To   Folder $t_fold : Could not select ",
-		$to->LastError, "\n";
-		$error++;
-		next FOLDER;
-	}
-	
-	if ($expunge){
-		print "Expunging $f_fold and $t_fold\n";
-		unless($dry) { $from->expunge() };
-		#unless($dry) { $to->expunge() };
-	}
-	
-	if ($subscribe and exists $subscribed_folder{$f_fold}) {
-		print "Subscribing to folder $t_fold on destination server\n";
-		unless($dry) { $to->subscribe($t_fold) };
-	}
-	
-	next FOLDER if ($justfolders);
-
-	last FOLDER if $from->IsUnconnected();
-	last FOLDER if   $to->IsUnconnected();
-
-	my @f_msgs = select_msgs($from);
-
-
-
-	$debug and print "LIST FROM : ", scalar(@f_msgs), " messages [@f_msgs]\n";
-	# internal dates on "TO" are after the ones on "FROM"
-	# normally...
-	my @t_msgs = select_msgs($to);
-	
-	$debug and print "LIST TO   : ", scalar(@t_msgs), " messages [@t_msgs]\n";
-
-	my %f_hash = ();
-	my %t_hash = ();
-	
-	print "++++ From [$f_fold] Parse 1 ++++\n";
-	last FOLDER if $from->IsUnconnected();
-	last FOLDER if   $to->IsUnconnected();
-
-	my $f_heads = $from->parse_headers([@f_msgs],
-					    @useheader)if (@f_msgs) ;
-	$debug and print "Time headers: ", timenext(), " s\n";
-	my $f_fir  = $from->fetch_hash("FLAGS",
-				       "INTERNALDATE",
-				       "RFC822.SIZE") if (@f_msgs);
-	$debug and print "Time fir  : ", timenext(), " s\n";
-	
-	foreach my $m (@f_msgs) {
-		parse_header_msg1($from, $m, $f_heads, $f_fir, "F", \%f_hash);
-	}
-	$debug and print "Time headers: ", timenext(), " s\n";
-	
-	print "++++ To   [$t_fold] Parse 1 ++++\n";
-	last FOLDER if $from->IsUnconnected();
-	last FOLDER if   $to->IsUnconnected();
-
-	my $t_heads =   $to->parse_headers([@t_msgs],
-					    @useheader) if (@t_msgs);
-	$debug and print "Time headers: ", timenext(), " s\n";
-	my $t_fir  =   $to->fetch_hash("FLAGS",
-				       "INTERNALDATE",
-				       "RFC822.SIZE") if (@t_msgs);
-	$debug and print "Time fir  : ", timenext(), " s\n";
-	foreach my $m (@t_msgs) {
-		parse_header_msg1($to, $m, $t_heads, $t_fir, "T", \%t_hash);
-	}
-	$debug and print "Time headers: ", timenext(), " s\n";
-	
-	print "++++ Verifying [$f_fold] -> [$t_fold] ++++\n";
-	# messages in "from" that are not good in "to"
-	
-	my @f_hash_keys_sorted_by_uid 
-	  = sort {$f_hash{$a}{'m'} <=> $f_hash{$b}{'m'}} keys(%f_hash);
-	
-	#print map { $f_hash{$_}{'m'} . " "} @f_hash_keys_sorted_by_uid;
-	
-	my @t_hash_keys_sorted_by_uid 
-	  = sort {$t_hash{$a}{'m'} <=> $t_hash{$b}{'m'}} keys(%t_hash);
-
-	
-	if($delete2) {
-		foreach my $m_id (@t_hash_keys_sorted_by_uid) {
-			#print "$m_id ";
-			unless (exists($f_hash{$m_id})) {
-				my $t_msg  = $t_hash{$m_id}{'m'};
-				print "deleting message $m_id  $t_msg\n";
-				$to->delete_message($t_msg) unless ($dry);	
-			}
-		}
-	}
-
-	MESS: foreach my $m_id (@f_hash_keys_sorted_by_uid) {
-		my $f_size = $f_hash{$m_id}{'s'};
-		my $f_msg = $f_hash{$m_id}{'m'};
-		my $f_idate = $f_hash{$m_id}{'D'};
-		
-		if (defined $maxsize and $f_size > $maxsize) {
-			print "+ Skipping msg #$f_msg:$f_size in folder $f_fold (exceeds maxsize limit $maxsize bytes)\n";
-			$mess_size_total_skipped += $f_size;
-			$mess_skipped += 1;
-			next MESS;
-		}
-		$debug and print "+ key     $m_id #$f_msg\n";
-		unless (exists($t_hash{$m_id})) {
-			print "+ NO msg #$f_msg [$m_id] in $t_fold\n";
-			# copy
-			print "+ Copying msg #$f_msg:$f_size to folder $t_fold\n";
-			last FOLDER if $from->IsUnconnected();
-			#my $string = $from->message_string($f_msg);			
-			my $message_file = "tmp_imapsync_$$";
-			unlink($message_file);
-			$from->message_to_file($message_file, $f_msg);
-			my $string = file_to_string($message_file);
-			#unlink($message_file);
-			if (@regexmess) {
-				foreach my $regexmess (@regexmess) {
-					$debug and print "eval \$string =~ $regexmess\n";
-					eval("\$string =~ $regexmess");
-				}
-				string_to_file($string, $message_file);
-			}
-			$debug and print "F message content begin next line\n",
-			  $string,
-			    "F message content ended on previous line\n";
-			my $d = "";
-			if ($syncinternaldates) {
-				$d = $f_idate;
-				$debug and print "internal date from 1: [$d]\n";
-				require Date::Manip;
-				Date::Manip->import(qw(ParseDate Date_Cmp UnixDate));
-				$d = UnixDate(ParseDate($d), "%d-%b-%Y %H:%M:%S %z");
-				$d = "\"$d\"";
-				$debug and print "internal date from 1: [$d] (fixed)\n";
-			}
-			
-			my $flags_f = $f_hash{$m_id}{'F'} || "";
-			# RFC 2060 : This flag can not be altered by any client
-			$flags_f =~ s@\\Recent@@gi;
-			$flags_f = flags_regex($flags_f) if @regexflag;
-			
-			my $new_id;
-			print "flags from : [$flags_f][$d]\n";
-			last FOLDER if   $to->IsUnconnected();
-			unless ($dry) {
-				
-				if ($OSNAME eq "MSWin32") {
-					$new_id = $to->append_string($t_fold,$string, $flags_f, $d);
-				}
-				else {
-					$new_id = $to->append_file($t_fold, $message_file, "", $flags_f, $d);
-				}
-				unless($new_id){
-					warn "Couldn't append msg #$f_msg (Subject:[".
-					  $from->subject($f_msg)."]) to folder $t_fold: ",
-					  $to->LastError, "\n";
-					$error++;
-					$mess_size_total_error += $f_size;
-					next MESS;
-				}
-				else{
-					# good
-					# $new_id is an id if the IMAP server has the 
-					# UIDPLUS capability else just a ref
-					print "Copied msg id [$f_msg] to folder $t_fold msg id [$new_id]\n";
-					$mess_size_total_trans += $f_size;
-					$mess_trans += 1;
-					if($delete) {
-						print "Deleting msg #$f_msg in folder $f_fold\n";
-						$from->delete_message($f_msg) unless ($dry);
-						$from->expunge() if ($expunge and not $dry);
-					}
-				}
-			}
-			else{
-				$mess_skipped_dry += 1;
-			}
-			unlink($message_file);
-			next MESS;
-		}
-		else{
-			$debug and print "Message id [$m_id] found in t:$t_fold\n";
-			$mess_size_total_skipped += $f_size;
-			$mess_skipped += 1;
-		}
-		
-		$fast and next MESS;
-		#$debug and print "MESSAGE $m_id\n"; 
-		my $t_size = $t_hash{$m_id}{'s'};
-		my $t_msg  = $t_hash{$m_id}{'m'};
-		
-		
-		$debug and print "Setting flags\n";
-		last FOLDER if $from->IsUnconnected();
-		last FOLDER if   $to->IsUnconnected();
-
-		my (@flags_f,@flags_t);
-		my $flags_f_rv = $from->flags($f_msg);
-		@flags_f = @{$flags_f_rv} if ref($flags_f_rv);
-		
-		# No flag \Recent here, no ?
-		my $flags_f = join(" ", @flags_f);
-		
-		$flags_f = flags_regex($flags_f) if @regexflag;
-		
-		# This add or change flags but no flag are removed with this
-		$to->store($t_msg,
-			   "+FLAGS (" . $flags_f . ")"
-			  ) unless ($dry) ;
-		
-		my $flags_t_rv = $to->flags($t_msg);
-		@flags_t = @{$flags_t_rv} if ref($flags_t_rv);
-		my $flags_t = join(" ", @flags_t);
-		$debug and print 
-		  "flags from : $flags_f\n",
-		  "flags to   : $flags_t\n";
-		
-
-		$debug and do {
-			print "Looking dates\n"; 
-			#my $d_f = $from->internaldate($f_msg);
-			#my $d_t = $to->internaldate($t_msg);
-			my $d_f = $f_hash{$m_id}{'D'};
-			my $d_t = $t_hash{$m_id}{'D'};
-			print 
-			  "idate from : $d_f\n",
-			    "idate to   : $d_t\n";
-			
-			#unless ($d_f eq $d_t) {
-			#	print "!!! Dates differ !!!\n";
-			#}
-		};
-		unless (($f_size == $t_size) or $skipsize) {
-			# Bad size
-			print 
-			"Message $m_id SZ_BAD  f:$f_msg:$f_size t:$t_msg:$t_size\n";
-			# delete in to and recopy ?
-			# NO recopy CODE HERE. to be written if needed.
-			$error++;
-			if ($opt_G){
-				print "Deleting msg f:#$t_msg in folder $t_fold\n";
-				$to->delete_message($t_msg) unless ($dry);
-			}
-		}
-		else {
-	    		# Good 
-			$debug and print
-			"Message $m_id SZ_GOOD f:$f_msg:$f_size t:$t_msg:$t_size\n";
-			if($delete) {
-				print "Deleting msg #$f_msg in folder $f_fold\n";
-				$from->delete_message($f_msg) unless ($dry);
-				$from->expunge() if ($expunge and not $dry);
-			}
-		}
-	}
-	if ($expunge1){
-		print "Expunging source folder $f_fold\n";
-		unless($dry) { $from->expunge() };
-	}
-	if ($expunge2){
-		print "Expunging target folder $t_fold\n";
-		unless($dry) { $to->expunge() };
-	}
-
-print "Time : ", timenext(), " s\n";
-}
-$from->logout();
-$to->logout();
-
-$timeend = time();
-
-$timediff = $timeend - $timestart;
-
-stats();
-
-
-
-
-exit(1) if($error);
-
-sub select_msgs {
-	my ($imap) = @_;
-	my (@msgs,@max,@min,@union,@inter);
-	
-	unless (defined($maxage) or defined($minage)) {
-		@msgs = $imap->search("ALL");
-		return(@msgs);
-	}
-	if (defined($maxage)) {
-		@max = $imap->sentsince(time - 86400 * $maxage);
-	}
-	if (defined($minage)) {
-		@min = $imap->sentbefore(time - 86400 * $minage);
-	}
-      SWITCH: {
-		unless(defined($minage)) {@msgs = @max; last SWITCH};
-		unless(defined($maxage)) {@msgs = @min; last SWITCH};
-		my (%union, %inter); 
-		foreach my $m (@min, @max) {$union{$m}++ && $inter{$m}++}
-		@inter = keys(%inter);
-		@union = keys(%union);
-		# normal case
-		if ($minage <= $maxage)  {@msgs = @inter; last SWITCH};
-		# just exclude messages between
-		if ($minage > $maxage)  {@msgs = @union; last SWITCH};
-		
-	}
-	return(@msgs);
-}
-
-sub stats {
-	print "++++ Statistics ++++\n";
-	print "Time                   : $timediff sec\n";
-	print "Messages transferred   : $mess_trans ";
-	print "(could be $mess_skipped_dry without dry mode)" if ($dry);
-	print "\n";
-	print "Messages skipped       : $mess_skipped\n";
-	print "Total bytes transferred: $mess_size_total_trans\n";
-	print "Total bytes skipped    : $mess_size_total_skipped\n";
-	print "Total bytes error      : $mess_size_total_error\n";
-	print "Detected $error errors\n";
-	print "Please, rate imapsync at http://freshmeat.net/projects/imapsync/\n";
-	print "?Happy with this free, open source and gratis GPL software?\n",
-	  "Feel free to thank the author by giving him a book:\n",
-	  "http://www.amazon.com/gp/registry/wishlist/1C9UNDIH3P7R7/\n",
-	  "(or its paypal account gilles.lamiral\@laposte.net)\n";
-
-
-}
-
-
-sub get_options
-{
-	my $numopt = scalar(@ARGV);
-        my $opt_ret = GetOptions(
-                                   "debug!"       => \$debug,
-                                   "debugimap!"   => \$debugimap,
-                                   "host1=s"     => \$host1,
-                                   "host2=s"     => \$host2,
-                                   "port1=i"     => \$port1,
-                                   "port2=i"     => \$port2,
-                                   "user1=s"     => \$user1,
-                                   "user2=s"     => \$user2,
-                                   "password1=s" => \$password1,
-                                   "password2=s" => \$password2,
-                                   "passfile1=s" => \$passfile1,
-                                   "passfile2=s" => \$passfile2,
-				   "authmd5!"    => \$authmd5,
-                                   "sep1=s"      => \$sep1,
-                                   "sep2=s"      => \$sep2,
-				   "folder=s"    => \@folder,
-				   "folderrec=s" => \@folderrec,
-				   "include=s"   => \@include,
-				   "exclude=s"   => \@exclude,
-				   "prefix1=s"   => \$prefix1,
-				   "prefix2=s"   => \$prefix2,
-				   "regextrans2=s" => \@regextrans2,
-				   "regexmess=s" => \@regexmess,
-				   "regexflag=s" => \@regexflag,
-                                   "delete!"     => \$delete,
-                                   "delete2!"    => \$delete2,
-                                   "syncinternaldates!" => \$syncinternaldates,
-                                   "syncacls!"   => \$syncacls,
-				   "maxsize=i"   => \$maxsize,
-				   "maxage=i"    => \$maxage,
-				   "minage=i"    => \$minage,
-				   "buffersize=i" => \$buffersize,
-				   "foldersizes!" => \$foldersizes,
-                                   "dry!"        => \$dry,
-                                   "expunge!"    => \$expunge,
-                                   "expunge1!"    => \$expunge1,
-                                   "expunge2!"    => \$expunge2,
-                                   "subscribed!" => \$subscribed,
-                                   "subscribe!"  => \$subscribe,
-                                   "justconnect!"=> \$justconnect,
-                                   "justfolders!"=> \$justfolders,
-				   "justfoldersizes!" => \$justfoldersizes,
-				   "fast!"       => \$fast,
-                                   "version"     => \$version,
-                                   "help"        => \$help,
-                                   "timeout=i"   => \$timeout,
-				   "skipheader=s" => \$skipheader,
-				   "useheader=s" => \@useheader,
-				   "skipsize!"   => \$skipsize,
-				   "fastio1!"     => \$fastio1,
-				   "fastio2!"     => \$fastio2,
-				   "ssl1!"        => \$ssl1,
-				   "ssl2!"        => \$ssl2,
-				   "authmech1=s" => \$authmech1,
-				   "authmech2=s" => \$authmech2,
-				   "authuser1=s" => \$authuser1,
-				   "authuser2=s" => \$authuser2,
-				   "split1=i"    => \$split1,
-				   "split2=i"    => \$split2,
-                                   "tests"       => \$tests,
-                                  );
-	
-        $debug and print "get options: [$opt_ret]\n";
-
-	# just the version
-        print "$VERSION\n" and exit if ($version) ;
-
-	tests() and exit if ($tests);
-
-	# exit with --help option or no option at all
-        usage() and exit if ($help or ! $numopt) ;
-
-	# don't go on if options are not all known.
-        exit(EX_USAGE()) unless ($opt_ret) ;
-	
-	
-}
-
-
-sub parse_header_msg1 {
-	my ($imap, $m_uid, $s_heads, $s_fir, $s, $s_hash) = @_;
-	
-	my $head = $s_heads->{$m_uid};
-	my $headnum =  scalar(keys(%$head));
-	$debug and print "Head NUM:", $headnum, "\n";
-	unless($headnum) { print "Warning : no header used or found \n"; }
-	my $headstr;
-	
-	foreach my $h (sort keys(%$head)){
-		foreach my $val (sort @{$head->{$h}}) {
-			# no 8-bit data in headers !
-			$val =~ s/[\x80-\xff]/X/g;
-			
-			# remove the first blanks (dbmail bug ?)
-			# and uppercase  header keywords 
-			# (dbmail and dovecot)
-			$val =~ s/^\s*(.+)$/$1/;
-			my $H = uc($h);
-			# show stuff in debug mode
-			$debug and print "${s}H $H:", $val, "\n";
-			if ($skipheader and $H =~ m/$skipheader/i) {
-				$debug and print "Skipping header $h\n";
-				next;
-			}
-			$headstr .= "$H:". $val;
-		}
-	}
-	#return unless ($headstr);
-	unless ($headstr){
-		print "no header so taking everything\n";
-		$headstr = $imap->message_string($m_uid);
-	}
-	my $size  = $s_fir->{$m_uid}->{"RFC822.SIZE"};
-	my $flags = $s_fir->{$m_uid}->{"FLAGS"};
-	my $idate = $s_fir->{$m_uid}->{"INTERNALDATE"};
-	$size = length($headstr) unless ($size);
-	my $m_md5 = md5_base64($headstr);	
-	$debug and print "$s msg $m_uid:$m_md5:$size\n";
-	my $key;
-        if ($skipsize) {
-                $key = "$m_md5";
-        }
-	else {
-                $key = "$m_md5:$size";
-        }
-	$s_hash->{"$key"}{'5'} = $m_md5;
-	$s_hash->{"$key"}{'s'} = $size;
-	$s_hash->{"$key"}{'D'} = $idate;
-	$s_hash->{"$key"}{'F'} = $flags;
-	$s_hash->{"$key"}{'m'} = $m_uid;
-}
-
-
-sub  firstline {
-        # extract the first line of a file (without \n)
-
-        my($file) = @_;
-        my $line  = "";
-        
-        open FILE, $file or die("error [$file]: $! ");
-        chomp($line = <FILE>);
-        close FILE;
-        $line = ($line) ? $line : "error !EMPTY! [$file]";
-        return $line;
-}
-
-
-sub file_to_string {
-	my($file) = @_;
-	my @string;
-	open FILE, $file or die("error [$file]: $! ");
-	@string = <FILE>;
-	close FILE;
-	return join("", @string);
-}
-
-
-sub string_to_file {
-	my($string, $file) = @_;
-	sysopen(FILE, $file,O_WRONLY|O_TRUNC|O_CREAT, 0600) or die("$! $file");
-	print FILE $string;
-	close FILE;
-}
-
-
-
-sub usage {
-	my $localhost_info = localhost_info();
-        print <<EOF;
-
-usage: $0 [options]
-
-Several options are mandatory. 
-
---host1       <string> : "from" imap server. Mandatory.
---port1       <int>    : port to connect on host1. Default is 143.
---user1       <string> : user to login on host1. Mandatory.
---authuser1   <string> : user to auth with on host1 (admin user). 
-                         Avoid using --authmech1 SOMETHING with --authuser1.
---password1   <string> : password for the user1. Dangerous, use --passfile1
---passfile1   <string> : password file for the user1. Contains the password.
---host2       <string> : "destination" imap server. Mandatory.
---port2       <int>    : port to connect on host2. Default is 143.
---user2       <string> : user to login on host2. Mandatory.
---authuser2   <string> : user to auth with on host2 (admin user).
---password2   <string> : password for the user2. Dangerous, use --passfile2
---passfile2   <string> : password file for the user2. Contains the password.
---noauthmd5            : don't use MD5 authentification.
---authmech1   <string> : auth mechanism to use with host1:
-                         PLAIN, LOGIN, CRAM-MD5 etc. Use UPPERCASE.
---authmech2   <string> : auth mechanism to use with host2. See --authmech1
---ssl1                 : use an SSL connection on host1.
---ssl2                 : use an SSL connection on host2.
---folder      <string> : sync this folder.
---folder      <string> : and this one, etc.
---folderrec   <string> : sync this folder recursively.
---folderrec   <string> : and this one, etc.
---include     <regex>  : sync folders matching this regular expression
---include     <regex>  : or this one, etc.
-                         in case both --include --exclude options are
-                         use, include is done before.
---exclude     <regex>  : skips folders matching this regular expression
-                         Several folders to avoid:
-			  --exclude 'fold1|fold2|f3' skips fold1, fold2 and f3.
---exclude     <regex>  : or this one, etc.
---prefix1     <string> : remove prefix to all destination folders 
-                         (usually INBOX. for cyrus imap servers)
-                         you can use --prefix1 if your source imap server 
-                         does not have NAMESPACE capability.
---prefix2     <string> : add prefix to all destination folders 
-                         (usually INBOX. for cyrus imap servers)
-                         use --prefix2 if your target imap server does not
-                         have NAMESPACE capability.
---regextrans2 <regex>  : Apply the whole regex to each destination folders.
---regextrans2 <regex>  : and this one. etc.
-                         When you play with the --regextrans2 option, first
-                         add also the safe options --dry --justfolders
-                         Then, when happy, remove --dry, remove --justfolders
---regexmess   <regex>  : Apply the whole regex to each message before transfer.
-                         Example : 's/\\000/ /g' # to replace null by space.
---regexmess   <regex>  : and this one.
---regexmess   <regex>  : and this one, etc.
---regexflag   <regex>  : Apply the whole regex to each flags list.
-                         Example : 's/\"Junk"//g' # to remove "Junk" flag.
---regexflag   <regex>  : and this one, etc.
---sep1        <string> : separator in case namespace is not supported.
---sep2        <string> : idem.
---delete               : delete messages on source imap server after
-                         a successful transfer. Useful in case you
-                         want to migrate from one server to another one.
-			 With imap, delete tags messages as deleted, they
-			 are not really deleted. See expunge.
---delete2              : delete messages on the destination imap server that
-                         are not on the source server.
---expunge              : expunge messages on source account.
-                         expunge really deletes messages marked deleted.
-                         expunge is made at the beginning on the 
-                         source server only. newly transferred messages
-                         are expunged if option --expunge is given.
-                         no expunge is done on destination account but
-                         it will change in future releases.
---expunge1             : expunge messages on source account.
---expunge2             : expunge messages on target account.
---syncinternaldates    : sets the internal dates on host2 same as host1
---buffersize  <int>    : sets the size of a block of I/O.
---maxsize     <int>    : skip messages larger than <int> bytes
---maxage      <int>    : skip messages older than <int> days.
-                         final stats (skipped) don't count older messages
-			 see also --minage
---minage      <int>    : skip messages newer than <int> days.
-                         final stats (skipped) don't count newer messages
-                         You can do (+ are the messages selected):
-                         past|----maxage+++++++++++++++>now
-                         past|+++++++++++++++minage---->now
-                         past|----maxage+++++minage---->now (intersection)
-                         past|++++minage-----maxage++++>now (union)
---skipheader  <regex>  : Don't take into account header keyword 
-                         matching <string> ex: --skipheader 'X.*'
---useheader   <string> : Use this header to compare messages on both sides.
-                         Ex: Message-ID or Subject or Date.
---useheader   <string>   and this one, etc.
---skipsize             : Don't take message size into account.
---dry                  : do nothing, just print what would be done.
---subscribed           : transfers subscribed folders.
---subscribe            : subscribe to the folders transferred on the 
-                         "destination" server that are subscribed
-                         on the "source" server.
---(no)foldersizes      : Calculate the size of each "From" folder in bytes
-                         and message counts. Meant to be used with
-                         --justfoldersizes. Turned on by default.
---justfoldersizes      : exit after printed the folder sizes.
---syncacls             : Synchronises acls (Access Control Lists).
---nosyncacls           : Does not synchronise acls. This is the default.
---debug                : debug mode.
---debugimap            : imap debug mode.
---version              : print software version.
---justconnect          : just connect to both servers and print useful
-                         information. Need only --host1 and --host2 options.
---justfolders          : just do things about folders (ignore messages).
---fast                 : be faster (just does not sync flags).
---split1     <int>     : split the requests in several parts on source server.
-                         <int > is the number of messages handled per request.
-                         default is like --split1 1000
---split2     <int>     : same thing on the "destination" server.
---fastio1              : use fastio with the "from" server.
---fastio2              : use fastio with the "destination" server.
---timeout     <int>    : imap connect timeout.
---help                 : print this.
-
-Example: to synchronise imap account "foo" on "imap.truc.org"
-                     to imap account "bar" on "imap.trac.org"
-
-$0 \\
-   --host1 imap.truc.org --user1 foo --passfile1 /etc/secret1 \\
-   --host2 imap.trac.org --user2 bar --passfile2 /etc/secret2
-
-$localhost_info
- Mail::IMAPClient version is $Mail::IMAPClient::VERSION
-$rcs
-      imapsync copyleft is the GNU General Public License.
-      See http://www.gnu.org/copyleft/gpl.html
-http://www.amazon.com/gp/registry/wishlist/1C9UNDIH3P7R7/
-EOF
-}
-
-
-sub tests {
-	ok( 1 == 1 ); # 
-	tests_folder_routines();
-	tests_compare_lists();
-
-}
-
-
-package Mail::IMAPClient;
-
-
-sub Authuser {
-	my $self = shift;
-	
-	if (@_) { $self->{AUTHUSER} = shift }
-	return $self->{AUTHUSER};
-}
-
-
-sub Split {
-	my $self = shift;
-	
-	if (@_) { $self->{SPLIT} = shift }
-	return $self->{SPLIT};
-}
-
-# From IMAPClient.pm
-sub append_file2 {
-
-        my $self        = shift;
-        my $folder      = $self->Massage(shift);
-        my $file        = shift; 
-        my $control     = shift || undef;
-        my $count       = $self->Count($self->Count+1);
-	my $flags       = shift || undef;
-	my $date        = shift || undef;
-	
-	if (defined($flags)) {
-                $flags =~ s/^\s+//g;
-                $flags =~ s/\s+$//g;
-        }
-	
-        if (defined($date)) {
-                $date =~ s/^\s+//g;
-                $date =~ s/\s+$//g;
-        }
-	
-        $flags = "($flags)"  if $flags and $flags !~ /^\(.*\)$/ ;
-        $date  = qq/"$date"/ if $date  and $date  !~ /^"/       ;
-	
-
-        unless ( -f $file ) {
-                $self->LastError("File $file not found.\n");
-                return undef;
-        }
-
-        my $fh = IO::File->new($file) ;
-
-        unless ($fh) {
-                $self->LastError("Unable to open $file: $!\n");
-                $@ = "Unable to open $file: $!" ;
-                carp "unable to open $file: $!" if $^W;
-                return undef;
-        }
-
-        my $bare_nl_count = scalar grep { /^\x0a$|[^\x0d]\x0a$/} <$fh>;
-
-        seek($fh,0,0);
-
-        my $clear = $self->Clear;
-
-        $self->Clear($clear)
-                if $self->Count >= $clear and $clear > 0;
-
-        my $length = ( -s $file ) + $bare_nl_count;
-
-	my $string = "$count APPEND $folder " .
-	             ( $flags ? "$flags " : ""       ) .
-	             ( $date ? "$date " : ""         ) .
-	             "{" . $length  . "}\x0d\x0a" ;
-	
-        $self->_record($count,[ $self->_next_index($count), "INPUT", "$string" ] );
-
-        my $feedback = $self->_send_line("$string");
-
-        unless ($feedback) {
-                $self->LastError("Error sending '$string' to IMAP: $!\n");
-                $fh->close;
-                return undef;
-        }
-
-        my ($code, $output) = ("","");
-
-        until ( $code ) {
-                $output = $self->_read_line or $fh->close, return undef;
-                foreach my $o (@$output) {
-                        $self->_record($count,$o);              # $o is already an array ref
-                      ($code) = $o->[DATA] =~ /(^\+|^\d+\sNO|^\d+\sBAD)/i; 
-                      if ($o->[DATA] =~ /^\*\s+BYE/) {
-                              carp $o->[DATA] if $^W;
-                                $self->State(Unconnected);
-                                $fh->close;
-                                return undef ;
-                      } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-                              carp $o->[DATA] if $^W;
-                                $fh->close;
-                                return undef;
-                        }
-                }
-        }
-
-        {       # Narrow scope
-                # Slurp up headers: later we'll make this more efficient I guess
-                local $/ = "\x0d\x0a\x0d\x0a"; 
-                my $text = <$fh>;
-                $text =~ s/\x0d?\x0a/\x0d\x0a/g;
-                $self->_record($count,[ $self->_next_index($count), "INPUT", "{From file $file}" ] ) ;
-                $feedback = $self->_send_line($text);
-
-                unless ($feedback) {
-                        $self->LastError("Error sending append msg text to IMAP: $!\n");
-                        $fh->close;
-                        return undef;
-                }
-                _debug $self, "control points to $$control\n" if ref($control) and $self->Debug;
-                $/ =    ref($control) ?  "\x0a" : $control ? $control :         "\x0a";
-                while (defined($text = <$fh>)) {
-                        $text =~ s/\x0d?\x0a/\x0d\x0a/g;
-                        $self->_record( $count,
-                                        [ $self->_next_index($count), "INPUT", "{from $file}\x0d\x0a" ] 
-                        );
-                        $feedback = $self->_send_line($text,1);
-
-                        unless ($feedback) {
-                                $self->LastError("Error sending append msg text to IMAP: $!\n");
-                                $fh->close;
-                                return undef;
-                        }
-                }
-                $feedback = $self->_send_line("\x0d\x0a");
-
-                unless ($feedback) {
-                        $self->LastError("Error sending append msg text to IMAP: $!\n");
-                        $fh->close;
-                        return undef;
-                }
-        } 
-
-        # Now for the crucial test: Did the append work or not?
-        ($code, $output) = ("","");
-
-        my $uid = undef;
-        until ( $code ) {
-                $output = $self->_read_line or return undef;
-                foreach my $o (@$output) {
-                        $self->_record($count,$o);              # $o is already an array ref
-                      $self->_debug("append_file: Deciding if " . $o->[DATA] . " has the code.\n") 
-                                if $self->Debug;
-                      ($code) = $o->[DATA]  =~ /^\d+\s(NO|BAD|OK)/i; 
-                        # try to grab new msg's uid from o/p
-                      $o->[DATA]  =~ m#UID\s+\d+\s+(\d+)\]# and $uid = $1; 
-                      if ($o->[DATA] =~ /^\*\s+BYE/) {
-                              carp $o->[DATA] if $^W;
-                                $self->State(Unconnected);
-                                $fh->close;
-                                return undef ;
-                      } elsif ( $o->[DATA]=~ /^\d+\s+(NO|BAD)/i ) {
-                              carp $o->[DATA] if $^W;
-                                $fh->close;
-                                return undef;
-                        }
-                }
-        }
-        $fh->close;
-
-        if ($code !~ /^OK/i) {
-                return undef;
-        }
-
-
-        return defined($uid) ? $uid : $self;
-}
-
-# From IMAPClient.pm
-sub fetch_hash2 {
-	# taken from original lib, 
-	# just added split code.
-        my $self = shift;
-        my $hash = ref($_[-1]) ? pop @_ : {};
-        my @words = @_;
-        for (@words) { 
-                s/([\( ])FAST([\) ])/${1}FLAGS INTERNALDATE RFC822\.SIZE$2/i  ;
-                s/([\( ])FULL([\) ])/${1}FLAGS INTERNALDATE RFC822\.SIZE ENVELOPE BODY$2/i  ;
-        }
-        my $msgref_all = scalar($self->messages);
-	my $split = $self->Split() || scalar(@$msgref_all);
-	while(my @msgs = splice(@$msgref_all, 0, $split)) {
-	#print "SPLIT: @msgs\n";
-	my $msgref = \@msgs;
-	my $output = scalar($self->fetch($msgref,"(" . join(" ",@_) . ")")) 
-        ; #     unless grep(/\b(?:FAST|FULL)\b/i,@words);
-        my $x;
-        for ($x = 0;  $x <= $#$output ; $x++) {
-                my $entry = {};
-                my $l = $output->[$x];
-                if ($self->Uid) {       
-                        my($uid) = $l =~ /\((?:.* )?UID (\d+).*\)/i;
-                        next unless $uid;
-                        if ( exists $hash->{$uid} ) {
-                                $entry = $hash->{$uid} ;
-                        }
-			else {
-                                $hash->{$uid} ||= $entry;
-                        }
-                }
-		else {
-                        my($mid) = $l =~ /^\* (\d+) FETCH/i;
-                        next unless $mid;
-                        if ( exists $hash->{$mid} ) {
-                                $entry = $hash->{$mid} ;
-                        }
-			else {
-                                $hash->{$mid} ||= $entry;
-                        }
-                }
-                        
-                foreach my $w (@words) {
-                   if ( $l =~ /\Q$w\E\s*$/i ) {
-                        $entry->{$w} = $output->[$x+1];
-                        $entry->{$w} =~ s/(?:\x0a?\x0d)+$//g;
-                        chomp $entry->{$w};
-                   }
-		   else {
-                        $l =~ /\(           # open paren followed by ... 
-                                (?:.*\s)?   # ...optional stuff and a space
-                                \Q$w\E\s    # escaped fetch field<sp>
-                                (?:"        # then: a dbl-quote
-                                  (\\.|   # then bslashed anychar(s) or ...
-                                   [^"]+)   # ... nonquote char(s)
-                                "|          # then closing quote; or ...
-                                \(          # ...an open paren
-                                  (\\.|     # then bslashed anychar or ...
-                                   [^\)]+)  # ... non-close-paren char
-                                \)|         # then closing paren; or ...
-                                (\S+))      # unquoted string
-                                (?:\s.*)?   # possibly followed by space-stuff
-                                \)          # close paren
-                        /xi;
-                        $entry->{$w}=defined($1)?$1:defined($2)?$2:$3;
-                   }
-                }
-        }
-}
-        return wantarray ? %$hash : $hash;
-}
-
-
-# From IMAPClient.pm
-
-sub login2 {
-        my $self = shift;
-        return $self->authenticate($self->Authmechanism,$self->Authcallback) 
-                if $self->{Authmechanism};
-
-        my $id   = $self->User;
-        my $has_quotes = $id =~ /^".*"$/ ? 1 : 0;
-        my $string =    "Login " . ( $has_quotes ? $id : qq("$id") ) . 
-	                " " . $self->Password . "\r\n";
-        $self->_imap_command($string) 
-                and $self->State(Authenticated);
-        # $self->folders and $self->separator unless $self->NoAutoList;
-        unless ( $self->IsAuthenticated) {
-                my($carp)       =  $self->LastError;
-                $carp           =~ s/^[\S]+ ([^\x0d\x0a]*)\x0d?\x0a/$1/;
-                carp $carp unless defined wantarray;
-                return undef;
-        };
-        return $self;
-}
-
-# From IMAPClient.pm
-
-sub parse_headers2 {
-        my($self,$msgspec_all,@fields) = @_;
-        my(%fieldmap) = map { ( lc($_),$_ )  } @fields;
-        my $msg; my $string; my $field;
-	
-	unless(ref($msgspec_all) eq 'ARRAY') {
-		print "parse_headers2 want an ARRAY ref\n";
-		exit 1;
-	}
-	
-	my $headers = {};       # hash from message ids to header hash
-	my $split = $self->Split() || scalar(@$msgspec_all);
-	while(my @msgs = splice(@$msgspec_all, 0, $split)) {
-		$debug and print "SPLIT: @msgs\n";
-		my $msgspec = \@msgs;
-
-        # Make $msg a comma separated list, of messages we want
-        $msg = $self->Range($msgspec);
-		
-        if ($fields[0]  =~      /^[Aa][Ll]{2}$/         ) { 
-
-                $string =       "$msg body" . 
-                # use ".peek" if Peek parameter is a) defined and true, 
-                #       or b) undefined, but not if it's defined and untrue:
-
-                (       defined($self->Peek)            ? 
-                        ( $self->Peek ? ".peek" : "" )  : 
-                        ".peek" 
-                ) .  "[header]"                         ; 
-
-        }else {
-                $string =       "$msg body" .
-                # use ".peek" if Peek parameter is a) defined and true, or 
-                # b) undefined, but not if it's defined and untrue:
-
-                ( defined($self->Peek)                  ? 
-                        ( $self->Peek ? ".peek" : "" )  : 
-                        ".peek" 
-                ) .  "[header.fields (" . join(" ",@fields)     . ')]' ;
-        }
-
-        my @raw=$self->fetch(   $string ) or return undef;
-
-        
-        my $h = 0;              # reference to hash of current msgid, or 0 between msgs
-        
-        for my $header (map { split(/(?:\x0d\x0a)/,$_) } @raw) {
-                local($^W) = undef;
-                if ( $header =~ /^\*\s+\d+\s+FETCH\s+\(.*BODY\[HEADER(?:\]|\.FIELDS)/i) {
-                        if ($self->Uid) {
-                                if ( my($msgid) = $header =~ /UID\s+(\d+)/ ) {
-                                        $h = {};
-                                        $headers->{$msgid} = $h;
-                                } 
-				else {
-                                        $h = {};
-                                }
-                        } 
-			else {
-                                if ( my($msgid) = $header =~ /^\*\s+(\d+)/ ) {
-                                        #start of new message header:
-                                        $h = {};
-                                        $headers->{$msgid} = $h;
-                                }
-                        }
-                }
-                next if $header =~ /^\s+$/;
-
-                # ( for vi
-                if ($header =~ /^\)/) {           # end of this message
-                        $h = 0;                   # set to be between messages
-                        next;
-                }
-                # check for '<optional_white_space>UID<white_space><UID_number><optional_white_space>)'
-                # when parsing headers by UID.
-                if ($self->Uid and my($msgid) = $header =~ /^\s*UID\s+(\d+)\s*\)/) {
-                        $headers->{$msgid} = $h;        # store in results against this message
-                        $h = 0;                         # set to be between messages
-                        next;
-                }
-
-                if ($h != 0) {                    # do we expect this to be a header?
-                        my $hdr = $header;
-                        chomp $hdr;
-                        $hdr =~ s/\r$//;   
-                        if ($hdr =~ s/^(\S+):\s*//) { 
-                                $field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
-                                push @{$h->{$field}} , $hdr ;
-                        } elsif ($hdr =~ s/^.*FETCH\s\(.*BODY\[HEADER\.FIELDS.*\)\]\s(\S+):\s*//) { 
-                                $field = exists $fieldmap{lc($1)} ? $fieldmap{lc($1)} : $1 ;
-                                push @{$h->{$field}} , $hdr ;
-                        } elsif ( ref($h->{$field}) eq 'ARRAY') {
-                                
-                                        $hdr =~ s/^\s+/ /;
-                                        $h->{$field}[-1] .= $hdr ;
-                        }
-                }
-        }
-        my $candump = 0;
-        if ($self->Debug) {
-                eval {
-                        require Data::Dumper;
-                        Data::Dumper->import;
-                };
-                $candump++ unless $@;
-        }
-
-	}
-        # if we asked for one message, just return its hash,
-        # otherwise, return hash of numbers => header hash
-        # if (ref($msgspec) eq 'ARRAY') {
-        
-	return $headers;
-        
-}
-
-
-# From IMAPClient.pm
-
-sub authenticate2 {
-
-        my $self        = shift;
-        my $scheme      = shift;
-        my $response    = shift;
-
-        $scheme   ||= $self->Authmechanism;
-        $response ||= $self->Authcallback;
-        my $clear = $self->Clear;
-
-        $self->Clear($clear)
-                if $self->Count >= $clear and $clear > 0;
-
-        my $count       = $self->Count($self->Count+1);
-
-
-        my $string = "$count AUTHENTICATE $scheme";
-
-        $self->_record($count,[ $self->_next_index($self->Transaction), 
-                                "INPUT", "$string\x0d\x0a"] );
-
-        my $feedback = $self->_send_line("$string");
-
-        unless ($feedback) {
-                $self->LastError("Error sending '$string' to IMAP: $!\n");
-                return undef;
-        }
-
-        my ($code, $output);
-
-        until ($code) {
-                $output = $self->_read_line or return undef;
-                foreach my $o (@$output) {
-                        $self->_record($count,$o);      # $o is a ref
-                        ($code) = $o->[DATA] =~ /^\+(.*)$/ ;
-                        if ($o->[DATA] =~ /^\*\s+BYE/) {
-                                $self->State(Unconnected);
-                                return undef ;
-                        }
-                }
-        }
-
-        return undef if $code =~ /^BAD|^NO/ ;
-
-        if ('CRAM-MD5' eq $scheme && ! $response) {
-          if ($Mail::IMAPClient::_CRAM_MD5_ERR) {
-            $self->LastError($Mail::IMAPClient::_CRAM_MD5_ERR);
-            carp $Mail::IMAPClient::_CRAM_MD5_ERR if $^W;
-          } 
-	  else {
-            $response = \&_cram_md5_2;
-          }
-        }
-
-        $feedback = $self->_send_line($response->($code, $self));
-
-        unless ($feedback) {
-                $self->LastError("Error sending append msg text to IMAP: $!\n");
-                return undef;
-        }
-
-        $code = "";     # clear code
-        until ($code) {
-                $output = $self->_read_line or return undef;
-                foreach my $o (@$output) {
-                        $self->_record($count,$o);      # $o is a ref
-                        if ( ($code) = $o->[DATA] =~ /^\+ (.*)$/ ) {
-                                $feedback = $self->_send_line($response->($code,$self));
-                                unless ($feedback) {
-                                        $self->LastError("Error sending append msg text to IMAP: $!\n");
-                                        return undef;
-                                }
-                                $code = "" ;            # Clear code; we're still not finished
-                        } else {
-                                $o->[DATA] =~ /^$count (OK|NO|BAD)/ and $code = $1;
-                                if ($o->[DATA] =~ /^\*\s+BYE/) {
-                                        $self->State(Unconnected);
-                                        return undef ;
-                                }
-                        }
-                }
-        }
-
-        $code =~ /^OK/ and $self->State(Authenticated) ;
-        return $code =~ /^OK/ ? $self : undef ;
-
-}
-
-sub _cram_md5_2 {
-  my ($code, $client) = @_;
-  my $hmac = Digest::HMAC_MD5::hmac_md5_hex(MIME::Base64::decode($code),
-                                            $client->Password());
-  return MIME::Base64::encode($client->User() . " $hmac", "");
-}
-
-
-sub connect2 {
-	my $self = shift;
-	
-	$self->Port(143) 
-		if 	defined ($IO::Socket::INET::VERSION) 
-		and 	$IO::Socket::INET::VERSION eq '1.25' 
-		and 	!$self->Port;
-	%$self = (%$self, @_);
-	my $sock = IO::Socket::INET->new;
-	my $dp = 'imap(143)';
-	#print "i01\n";
-	my $ret = $sock->configure({
-		PeerAddr => $self->Server		,
-                PeerPort => $self->Port||$dp	       	,
-                Proto    => 'tcp' 			,
-                Timeout  => $self->Timeout||0		,
-		Debug	=> $self->Debug 		,
-	});
-	#print "i02\n";
-	unless ( defined($ret) ) {
-		$self->LastError( "$@\n");	  
-		$@ 		= "$@";   
-		carp 		  "$@" 
-				unless defined wantarray;	
-		return undef;
-	}
-	#print "i03\n";
-	$self->Socket($sock);
-	$self->State(Connected);
-
-	$sock->autoflush(1)				;
-	
-	my ($code, $output);
-        $output = "";
-
-        until ( $code ) {
-
-                $output = $self->_read_line or return undef;
-                for my $o (@$output) {
-			$self->_debug("Connect: Received this from readline: " . 
-					join("/",@$o) . "\n");
-                        $self->_record($self->Count,$o);	# $o is a ref
-                      next unless $o->[TYPE] eq "OUTPUT";
-                      ($code) = $o->[DATA] =~ /^\*\s+(OK|BAD|NO)/i  ;
-                }
-
-        }
-
-	if ($code =~ /BYE|NO /) {
-		$self->State(Unconnected);
-		return undef ;
-	}
-
-	if ($self->User and $self->Password) {
-		return $self->login ;
-	} 
-	else {
-		return $self;	
-	}
-}
-	
diff --git a/t/01_connect_2.99_02.dump b/t/01_connect_2.99_02.dump
deleted file mode 100644
index 9efcb83..0000000
--- a/t/01_connect_2.99_02.dump
+++ /dev/null
@@ -1,743 +0,0 @@
-82$ perl -d -I Mail-IMAPClient-2.99_02/lib t/01_connect
-
-Loading DB routines from perl5db.pl version 1.28
-Editor support available.
-
-Enter h or `h h' for help, or `man perldebug' for more help.
-
-main::(t/01_connect:6): $imap = Mail::IMAPClient->new(Debug => 1);
-  DB<1> t
-Trace = on
-  DB<1> c
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:171):
-171:    {   my $class = shift;
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:172):
-172:        my $self  =
-173:          { LastError     => "",
-174:          , Uid           => 1
-175:          , Count         => 0
-176:          , Fast_io       => 1
-177:          , Clear         => 5
-178:          , Maxtemperrors => 'unlimited'
-179:          , State         => Unconnected
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:181):
-181:        while(@_)
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:182):
-182:        {   my $k = ucfirst lc shift;
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:183):
-183:            $self->{$k} = shift;
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:185):
-185:        bless $self, ref($class)||$class;
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:187):
-187:        if($self->{Supportedflags})  # unpack into case-less HASH
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:192):
-192:        $self->{Debug_fh} ||= \*STDERR;
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:193):
-193:        select((select($self->{Debug_fh}),$|++)[0]);
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:195):
-195:        $self->_debug("Using Mail::IMAPClient version $Mail::IMAPClient::VERSION " .
-196:            "and perl version " . (defined $^V ? join(".",unpack("CCC",$^V)) : "") .
-197:            " ($])\n") if $self->Debug;
-Mail::IMAPClient::CODE(0x850ebc0)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::_debug(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:40):
-40:     {   my $self = shift;
-Mail::IMAPClient::_debug(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:41):
-41:         return unless $self->Debug;
-Mail::IMAPClient::CODE(0x850ebc0)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::_debug(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:42):
-42:         my $fh   = $self->{Debug_fh} || \*STDERR;
-Mail::IMAPClient::_debug(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:43):
-43:         print $fh @_;
-Using Mail::IMAPClient version 2.99_02 and perl version 5.8.8 (5.008008)
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:199):
-199:        if($self->{Socket})    { $self->Socket($self->{Socket}) }
-Mail::IMAPClient::new(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:202):
-202:        $self;
-main::(t/01_connect:7): $imap->Debug(1);
-Mail::IMAPClient::CODE(0x850ebc0)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-main::(t/01_connect:8): $imap->Server('louloutte.dyndns.org');
-Mail::IMAPClient::CODE(0x850e878)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-main::(t/01_connect:9): $imap->connect() or croak "Error connecting @!";
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:206):
-206:    {   my $self = shift;
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:207):
-207:        %$self = (%$self, @_);
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:209):
-209:        my $sock = IO::Socket::INET->new
-210:          ( PeerAddr => $self->Server
-211:          , PeerPort => ( $self->Port   || 'imap(143)')
-212:          , Timeout  => ($self->Timeout || 0)
-213:          , Proto    => 'tcp'
-214:          , Debug    => $self->Debug
-215:          );
-Mail::IMAPClient::CODE(0x850e878)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::CODE(0x850e800)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::CODE(0x850ead0)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::CODE(0x850ebc0)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-IO::Socket::INET::new(/usr/lib/perl/5.8/IO/Socket/INET.pm:30):
-30:         my $class = shift;
-IO::Socket::INET::new(/usr/lib/perl/5.8/IO/Socket/INET.pm:31):
-31:         unshift(@_, "PeerAddr") if @_ == 1;
-IO::Socket::INET::new(/usr/lib/perl/5.8/IO/Socket/INET.pm:32):
-32:         return $class->SUPER::new(@_);
-IO::Socket::new(/usr/lib/perl/5.8/IO/Socket.pm:41):
-41:         my($class,%arg) = @_;
-IO::Socket::new(/usr/lib/perl/5.8/IO/Socket.pm:42):
-42:         my $sock = $class->SUPER::new();
-IO::Handle::new(/usr/lib/perl/5.8/IO/Handle.pm:53):
-53:         my $class = ref($_[0]) || $_[0] || "IO::Handle";
-IO::Handle::new(/usr/lib/perl/5.8/IO/Handle.pm:54):
-54:         @_ == 1 or croak "usage: new $class";
-IO::Handle::new(/usr/lib/perl/5.8/IO/Handle.pm:55):
-55:         my $io = gensym;
-Symbol::gensym(/usr/share/perl/5.8/Symbol.pm:23):
-23:         my $name = "GEN" . $genseq++;
-Symbol::gensym(/usr/share/perl/5.8/Symbol.pm:24):
-24:         my $ref = \*{$genpkg . $name};
-Symbol::gensym(/usr/share/perl/5.8/Symbol.pm:24):
-24:         my $ref = \*{$genpkg . $name};
-Symbol::gensym(/usr/share/perl/5.8/Symbol.pm:25):
-25:         delete $$genpkg{$name};
-Symbol::gensym(/usr/share/perl/5.8/Symbol.pm:26):
-26:         $ref;
-IO::Handle::new(/usr/lib/perl/5.8/IO/Handle.pm:56):
-56:         bless $io, $class;
-IO::Socket::new(/usr/lib/perl/5.8/IO/Socket.pm:44):
-44:         $sock->autoflush(1);
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:213):
-213:        my $old = new SelectSaver qualify($_[0], caller);
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:39):
-39:         my ($name) = @_;
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:40):
-40:         if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:53):
-53:         $name;
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:10):
-10:         @_ >= 1 && @_ <= 2 or croak 'usage: new SelectSaver [FILEHANDLE]';
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:11):
-11:         my $fh = select;
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:12):
-12:         my $self = bless \$fh, $_[0];
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:13):
-13:         select qualify($_[1], caller) if @_ > 1;
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:39):
-39:         my ($name) = @_;
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:40):
-40:         if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:53):
-53:         $name;
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:14):
-14:         $self;
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:214):
-214:        my $prev = $|;
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:215):
-215:        $| = @_ > 1 ? $_[1] : 1;
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:216):
-216:        $prev;
-SelectSaver::DESTROY(/usr/share/perl/5.8/SelectSaver.pm:18):
-18:         my $self = $_[0];
-SelectSaver::DESTROY(/usr/share/perl/5.8/SelectSaver.pm:19):
-19:         select $$self;
-IO::Socket::new(/usr/lib/perl/5.8/IO/Socket.pm:46):
-46:         ${*$sock}{'io_socket_timeout'} = delete $arg{Timeout};
-IO::Socket::new(/usr/lib/perl/5.8/IO/Socket.pm:46):
-46:         ${*$sock}{'io_socket_timeout'} = delete $arg{Timeout};
-IO::Socket::new(/usr/lib/perl/5.8/IO/Socket.pm:48):
-48:         return scalar(%arg) ? $sock->configure(\%arg)
-49:                             : $sock;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:104):
-104:        my($sock,$arg) = @_;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:105):
-105:        my($lport,$rport,$laddr,$raddr,$proto,$type);
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:107):
-107:        $arg->{LocalAddr} = $arg->{LocalHost}
-108:            if exists $arg->{LocalHost} && !exists $arg->{LocalAddr};
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:110):
-110:        ($laddr,$lport,$proto) = _sock_info($arg->{LocalAddr},
-111:                                            $arg->{LocalPort},
-112:                                            $arg->{Proto})
-113:                            or return _error($sock, $!, $@);
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:36):
-36:       my($addr,$port,$proto) = @_;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:37):
-37:       my $origport = $port;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:38):
-38:       my @proto = ();
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:39):
-39:       my @serv = ();
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:41):
-41:       $port = $1
-42:             if(defined $addr && $addr =~ s,:([\w\(\)/]+)$,,);
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:44):
-44:       if(defined $proto  && $proto =~ /\D/) {
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:45):
-45:         if(@proto = getprotobyname($proto)) {
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:46):
-46:           $proto = $proto[2] || undef;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:54):
-54:       if(defined $port) {
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:71):
-71:      return ($addr || undef,
-72:              $port || undef,
-73:              $proto || undef
-74:             );
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:115):
-115:        $laddr = defined $laddr ? inet_aton($laddr)
-116:                                : INADDR_ANY;
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:216):
-216:        my($constname);
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:217):
-217:        ($constname = $AUTOLOAD) =~ s/.*:://;
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:218):
-218:        croak "&Socket::constant not defined" if $constname eq 'constant';
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:219):
-219:        my ($error, $val) = constant($constname);
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:220):
-220:        if ($error) {
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:223):
-223:        *$AUTOLOAD = sub { $val };
-Socket::AUTOLOAD(/usr/lib/perl/5.8/Socket.pm:224):
-224:        goto &$AUTOLOAD;
-Socket::__ANON__[/usr/lib/perl/5.8/Socket.pm:223](/usr/lib/perl/5.8/Socket.pm:223):
-223:        *$AUTOLOAD = sub { $val };
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:118):
-118:        return _error($sock, $EINVAL, "Bad hostname '",$arg->{LocalAddr},"'")
-119:            unless(defined $laddr);
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:121):
-121:        $arg->{PeerAddr} = $arg->{PeerHost}
-122:            if exists $arg->{PeerHost} && !exists $arg->{PeerAddr};
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:124):
-124:        unless(exists $arg->{Listen}) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:125):
-125:            ($raddr,$rport,$proto) = _sock_info($arg->{PeerAddr},
-126:                                                $arg->{PeerPort},
-127:                                                $proto)
-128:                            or return _error($sock, $!, $@);
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:36):
-36:       my($addr,$port,$proto) = @_;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:37):
-37:       my $origport = $port;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:38):
-38:       my @proto = ();
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:39):
-39:       my @serv = ();
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:41):
-41:       $port = $1
-42:             if(defined $addr && $addr =~ s,:([\w\(\)/]+)$,,);
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:44):
-44:       if(defined $proto  && $proto =~ /\D/) {
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:54):
-54:       if(defined $port) {
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:55):
-55:         my $defport = ($port =~ s,\((\d+)\)$,,) ? $1 : undef;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:56):
-56:         my $pnum = ($port =~ m,^(\d+)$,)[0];
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:58):
-58:         @serv = getservbyname($port, $proto[0] || "")
-59:             if ($port =~ m,\D,);
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:61):
-61:         $port = $serv[2] || $defport || $pnum;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:62):
-62:         unless (defined $port) {
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:67):
-67:         $proto = (getprotobyname($serv[3]))[2] || undef
-68:             if @serv && !$proto;
-IO::Socket::INET::_sock_info(/usr/lib/perl/5.8/IO/Socket/INET.pm:71):
-71:      return ($addr || undef,
-72:              $port || undef,
-73:              $proto || undef
-74:             );
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:131):
-131:        $proto ||= (getprotobyname('tcp'))[2];
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:133):
-133:        my $pname = (getprotobynumber($proto))[0];
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:134):
-134:        $type = $arg->{Type} || $socket_type{lc $pname};
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:136):
-136:        my @raddr = ();
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:138):
-138:        if(defined $raddr) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:139):
-139:            @raddr = $sock->_get_addr($raddr, $arg->{MultiHomed});
-IO::Socket::INET::_get_addr(/usr/lib/perl/5.8/IO/Socket/INET.pm:92):
-92:         my($sock,$addr_str, $multi) = @_;
-IO::Socket::INET::_get_addr(/usr/lib/perl/5.8/IO/Socket/INET.pm:93):
-93:         my @addr;
-IO::Socket::INET::_get_addr(/usr/lib/perl/5.8/IO/Socket/INET.pm:94):
-94:         if ($multi && $addr_str !~ /^\d+(?:\.\d+){3}$/) {
-IO::Socket::INET::_get_addr(/usr/lib/perl/5.8/IO/Socket/INET.pm:97):
-97:             my $h = inet_aton($addr_str);
-IO::Socket::INET::_get_addr(/usr/lib/perl/5.8/IO/Socket/INET.pm:98):
-98:             push(@addr, $h) if defined $h;
-IO::Socket::INET::_get_addr(/usr/lib/perl/5.8/IO/Socket/INET.pm:100):
-100:        @addr;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:140):
-140:            return _error($sock, $EINVAL, "Bad hostname '",$arg->{PeerAddr},"'")
-141:                unless @raddr;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:144):
-144:        while(1) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:146):
-146:            $sock->socket(AF_INET, $type, $proto) or
-147:                return _error($sock, $!, "$!");
-Socket::CODE(0x84615a4)(/usr/lib/perl/5.8/Socket.pm:223):
-223:        *$AUTOLOAD = sub { $val };
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:77):
-77:         @_ == 4 or croak 'usage: $sock->socket(DOMAIN, TYPE, PROTOCOL)';
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:78):
-78:         my($sock,$domain,$type,$protocol) = @_;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:80):
-80:         socket($sock,$domain,$type,$protocol) or
-81:             return undef;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:83):
-83:         ${*$sock}{'io_socket_domain'} = $domain;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:83):
-83:         ${*$sock}{'io_socket_domain'} = $domain;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:84):
-84:         ${*$sock}{'io_socket_type'}   = $type;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:84):
-84:         ${*$sock}{'io_socket_type'}   = $type;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:85):
-85:         ${*$sock}{'io_socket_proto'}  = $protocol;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:85):
-85:         ${*$sock}{'io_socket_proto'}  = $protocol;
-IO::Socket::socket(/usr/lib/perl/5.8/IO/Socket.pm:87):
-87:         $sock;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:149):
-149:            if (defined $arg->{Blocking}) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:154):
-154:            if ($arg->{Reuse} || $arg->{ReuseAddr}) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:159):
-159:            if ($arg->{ReusePort}) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:164):
-164:            if ($arg->{Broadcast}) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:169):
-169:            if($lport || ($laddr ne INADDR_ANY) || exists $arg->{Listen}) {
-Socket::CODE(0x86a3604)(/usr/lib/perl/5.8/Socket.pm:223):
-223:        *$AUTOLOAD = sub { $val };
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:174):
-174:            if(exists $arg->{Listen}) {
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:181):
-181:            last unless exists($arg->{PeerAddr});
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:183):
-183:            $raddr = shift @raddr;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:185):
-185:            return _error($sock, $EINVAL, 'Cannot determine remote port')
-186:                    unless($rport || $type == SOCK_DGRAM || $type == SOCK_RAW);
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:189):
-189:                unless($type == SOCK_STREAM || defined $raddr);
-Socket::CODE(0x8476f40)(/usr/lib/perl/5.8/Socket.pm:223):
-223:        *$AUTOLOAD = sub { $val };
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:191):
-191:            return _error($sock, $EINVAL, "Bad hostname '",$arg->{PeerAddr},"'")
-192:                unless defined $raddr;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:197):
-197:            undef $@;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:198):
-198:            if ($sock->connect(pack_sockaddr_in($rport, $raddr))) {
-IO::Socket::INET::connect(/usr/lib/perl/5.8/IO/Socket/INET.pm:220):
-220:        @_ == 2 || @_ == 3 or
-221:           croak 'usage: $sock->connect(NAME) or $sock->connect(PORT, ADDR)';
-IO::Socket::INET::connect(/usr/lib/perl/5.8/IO/Socket/INET.pm:222):
-222:        my $sock = shift;
-IO::Socket::INET::connect(/usr/lib/perl/5.8/IO/Socket/INET.pm:223):
-223:        return $sock->SUPER::connect(@_ == 1 ? shift : pack_sockaddr_in(@_));
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:106):
-106:        @_ == 2 or croak 'usage: $sock->connect(NAME)';
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:107):
-107:        my $sock = shift;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:108):
-108:        my $addr = shift;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:109):
-109:        my $timeout = ${*$sock}{'io_socket_timeout'};
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:109):
-109:        my $timeout = ${*$sock}{'io_socket_timeout'};
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:110):
-110:        my $err;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:111):
-111:        my $blocking;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:113):
-113:        $blocking = $sock->blocking(0) if $timeout;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:114):
-114:        if (!connect($sock, $addr)) {
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:137):
-137:        $sock->blocking(1) if $blocking;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:139):
-139:        $! = $err if $err;
-IO::Socket::connect(/usr/lib/perl/5.8/IO/Socket.pm:141):
-141:        $err ? undef : $sock;
-IO::Socket::INET::configure(/usr/lib/perl/5.8/IO/Socket/INET.pm:200):
-200:                return $sock;
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:217):
-217:        unless($sock)
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:222):
-222:        $self->Socket($sock);
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:97):
-97:     {   my ($self, $sock) = @_;
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:98):
-98:         defined $sock
-99:            or return $self->{Socket};
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:101):
-101:        delete $self->{_fcntl};
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:103):
-103:        $self->{_select} = IO::Select->new($_[1]);
-IO::Select::new(/usr/lib/perl/5.8/IO/Select.pm:24):
-24:      my $self = shift;
-IO::Select::new(/usr/lib/perl/5.8/IO/Select.pm:25):
-25:      my $type = ref($self) || $self;
-IO::Select::new(/usr/lib/perl/5.8/IO/Select.pm:27):
-27:      my $vec = bless [undef,0], $type;
-IO::Select::new(/usr/lib/perl/5.8/IO/Select.pm:29):
-29:      $vec->add(@_)
-30:         if @_;
-IO::Select::add(/usr/lib/perl/5.8/IO/Select.pm:37):
-37:      shift->_update('add', @_);
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:63):
-63:      my $vec = shift;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:64):
-64:      my $add = shift eq 'add';
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:66):
-66:      my $bits = $vec->[VEC_BITS];
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:67):
-67:      $bits = '' unless defined $bits;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:69):
-69:      my $count = 0;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:70):
-70:      my $f;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:71):
-71:      foreach $f (@_)
-72:       {
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:73):
-73:        my $fn = $vec->_fileno($f);
-IO::Select::_fileno(/usr/lib/perl/5.8/IO/Select.pm:55):
-55:      my($self, $f) = @_;
-IO::Select::_fileno(/usr/lib/perl/5.8/IO/Select.pm:56):
-56:      return unless defined $f;
-IO::Select::_fileno(/usr/lib/perl/5.8/IO/Select.pm:57):
-57:      $f = $f->[0] if ref($f) eq 'ARRAY';
-IO::Select::_fileno(/usr/lib/perl/5.8/IO/Select.pm:58):
-58:      ($f =~ /^\d+$/) ? $f : fileno($f);
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:74):
-74:        next unless defined $fn;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:75):
-75:        my $i = $fn + FIRST_FD;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:76):
-76:        if ($add) {
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:77):
-77:          if (defined $vec->[$i]) {
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:81):
-81:          $vec->[FD_COUNT]++;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:82):
-82:          vec($bits, $fn, 1) = 1;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:83):
-83:          $vec->[$i] = $f;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:90):
-90:        $count++;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:92):
-92:      $vec->[VEC_BITS] = $vec->[FD_COUNT] ? $bits : undef;
-IO::Select::_update(/usr/lib/perl/5.8/IO/Select.pm:93):
-93:      $count;
-IO::Select::new(/usr/lib/perl/5.8/IO/Select.pm:32):
-32:      $vec;
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:223):
-223:        $self->State(Connected);
-Mail::IMAPClient::CODE(0x850e764)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:224):
-224:        $sock->autoflush(1);
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:213):
-213:        my $old = new SelectSaver qualify($_[0], caller);
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:39):
-39:         my ($name) = @_;
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:40):
-40:         if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:53):
-53:         $name;
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:10):
-10:         @_ >= 1 && @_ <= 2 or croak 'usage: new SelectSaver [FILEHANDLE]';
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:11):
-11:         my $fh = select;
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:12):
-12:         my $self = bless \$fh, $_[0];
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:13):
-13:         select qualify($_[1], caller) if @_ > 1;
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:39):
-39:         my ($name) = @_;
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:40):
-40:         if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-Symbol::qualify(/usr/share/perl/5.8/Symbol.pm:53):
-53:         $name;
-SelectSaver::new(/usr/share/perl/5.8/SelectSaver.pm:14):
-14:         $self;
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:214):
-214:        my $prev = $|;
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:215):
-215:        $| = @_ > 1 ? $_[1] : 1;
-IO::Handle::autoflush(/usr/lib/perl/5.8/IO/Handle.pm:216):
-216:        $prev;
-SelectSaver::DESTROY(/usr/share/perl/5.8/SelectSaver.pm:18):
-18:         my $self = $_[0];
-SelectSaver::DESTROY(/usr/share/perl/5.8/SelectSaver.pm:19):
-19:         select $$self;
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:226):
-226:        my $code;
-227:      LINE:
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:228):
-228:        while(my $output = $self->_read_line)
-Mail::IMAPClient::_read_line(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:1274):
-1274:   {   my ($self, $literal_callback, $output_callback) = @_;
-Mail::IMAPClient::_read_line(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:1276):
-1276:       my $sh = $self->Socket;
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:97):
-97:     {   my ($self, $sock) = @_;
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:98):
-98:         defined $sock
-99:            or return $self->{Socket};
-Mail::IMAPClient::_read_line(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:1277):
-1277:       unless($self->IsConnected && $self->Socket)
-Mail::IMAPClient::IsConnected(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:2816):
-2816:   sub IsConnected     { shift->State >= Connected }
-Mail::IMAPClient::CODE(0x850e764)(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:55):
-55:          *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:97):
-97:     {   my ($self, $sock) = @_;
-Mail::IMAPClient::Socket(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:98):
-98:         defined $sock
-99:            or return $self->{Socket};
-Mail::IMAPClient::_read_line(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:1278):
-1278:       {   $self->LastError("NO Not connected.");
-Mail::IMAPClient::LastError(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:60):
-60:     {   my $self = shift;
-Mail::IMAPClient::LastError(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:61):
-61:         $self->{LastError} = shift if @_;
-Mail::IMAPClient::LastError(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:62):
-62:         $@ = $self->{LastError};
-Mail::IMAPClient::_read_line(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:1279):
-1279:           return undef;
-Mail::IMAPClient::connect(Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm:238):
-238:        $code or return undef;
-Carp::croak(/usr/share/perl/5.8/Carp.pm:102):
-102:    sub croak   { die  shortmess @_ }
-Carp::shortmess(/usr/share/perl/5.8/Carp.pm:86):
-86:             local($@, $!);
-Carp::shortmess(/usr/share/perl/5.8/Carp.pm:86):
-86:             local($@, $!);
-Carp::shortmess(/usr/share/perl/5.8/Carp.pm:89):
-89:             require Carp::Heavy unless $INC{"Carp/Heavy.pm"};
-Carp::shortmess(/usr/share/perl/5.8/Carp.pm:92):
-92:         my $call_pack = caller();
-Carp::shortmess(/usr/share/perl/5.8/Carp.pm:93):
-93:         local @CARP_NOT = caller();
-Carp::shortmess(/usr/share/perl/5.8/Carp.pm:94):
-94:         shortmess_heavy(@_);
-Carp::shortmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:177):
-177:      return longmess_heavy(@_) if $Verbose;
-Carp::shortmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:178):
-178:      return @_ if ref($_[0]); # don't break references as exceptions
-Carp::shortmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:179):
-179:      my $i = short_error_loc();
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:160):
-160:      my $cache;
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:161):
-161:      my $i = 1;
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:162):
-162:      my $lvl = $CarpLevel;
-163:      {
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:164):
-164:        my $called = caller($i++);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:164):
-164:        my $called = caller($i++);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:165):
-165:        my $caller = caller($i);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:166):
-166:        return 0 unless defined($caller); # What happened?
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:167):
-167:        redo if $Internal{$caller};
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:168):
-168:        redo if $CarpInternal{$called};
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:164):
-164:        my $called = caller($i++);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:165):
-165:        my $caller = caller($i);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:166):
-166:        return 0 unless defined($caller); # What happened?
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:167):
-167:        redo if $Internal{$caller};
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:168):
-168:        redo if $CarpInternal{$called};
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:164):
-164:        my $called = caller($i++);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:165):
-165:        my $caller = caller($i);
-Carp::short_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:166):
-166:        return 0 unless defined($caller); # What happened?
-Carp::shortmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:180):
-180:      if ($i) {
-Carp::shortmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:184):
-184:        longmess_heavy(@_);
-Carp::longmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:115):
-115:      return @_ if ref($_[0]); # don't break references as exceptions
-Carp::longmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:116):
-116:      my $i = long_error_loc();
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:91):
-91:       my $i;
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:92):
-92:       my $lvl = $CarpLevel;
-93:       {
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:94):
-94:         my $pkg = caller(++$i);
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:94):
-94:         my $pkg = caller(++$i);
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:95):
-95:         unless(defined($pkg)) {
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:107):
-107:        redo if $CarpInternal{$pkg};
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:94):
-94:         my $pkg = caller(++$i);
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:95):
-95:         unless(defined($pkg)) {
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:107):
-107:        redo if $CarpInternal{$pkg};
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:94):
-94:         my $pkg = caller(++$i);
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:95):
-95:         unless(defined($pkg)) {
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:107):
-107:        redo if $CarpInternal{$pkg};
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:94):
-94:         my $pkg = caller(++$i);
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:95):
-95:         unless(defined($pkg)) {
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:107):
-107:        redo if $CarpInternal{$pkg};
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:108):
-108:        redo unless 0 > --$lvl;
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:109):
-109:        redo if $Internal{$pkg};
-Carp::long_error_loc(/usr/share/perl/5.8/Carp/Heavy.pm:111):
-111:      return $i - 1;
-Carp::longmess_heavy(/usr/share/perl/5.8/Carp/Heavy.pm:117):
-117:      return ret_backtrace($i, @_);
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:123):
-123:      my ($i, @error) = @_;
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:124):
-124:      my $mess;
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:125):
-125:      my $err = join '', @error;
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:126):
-126:      $i++;
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:128):
-128:      my $tid_msg = '';
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:129):
-129:      if (defined &Thread::tid) {
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:134):
-134:      my %i = caller_info($i);
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:12):
-12:       my $i = shift(@_) + 1;
-13:       package DB;
-14:
-15:
-16:
-17:
-18:
-19:
-20:
-21:
-22:
-23:
-24:
-25:
-26:
-27:
-28:
-29:
-30:
-31:
-32:
-33:
-34:
-35:
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:73):
-73:       my $info = shift;
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:74):
-74:       if (defined($info->{evaltext})) {
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:85):
-85:       return ($info->{sub} eq '(eval)') ? 'eval {...}' : $info->{sub};
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:39):
-39:       my $arg = shift;
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:40):
-40:       if (ref($arg)) {
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:45):
-45:       $arg =~ s/'/\\'/g;
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:46):
-46:       $arg = str_len_trim($arg, $MaxArgLen);
-Carp::str_len_trim(/usr/share/perl/5.8/Carp/Heavy.pm:190):
-190:      my $str = shift;
-Carp::str_len_trim(/usr/share/perl/5.8/Carp/Heavy.pm:191):
-191:      my $max = shift || 0;
-Carp::str_len_trim(/usr/share/perl/5.8/Carp/Heavy.pm:192):
-192:      if (2 < $max and $max < length($str)) {
-Carp::str_len_trim(/usr/share/perl/5.8/Carp/Heavy.pm:195):
-195:      return $str;
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:49):
-49:       $arg = "'$arg'" unless $arg =~ /^-?[\d.]+\z/;
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:55):
-55:         or $arg =~ s/([[:cntrl:]]|[[:^ascii:]])/sprintf("\\x{%x}",ord($1))/eg;
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:56):
-56:       return $arg;
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:135):
-135:      $mess = "$err at $i{file} line $i{line}$tid_msg\n";
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:137):
-137:      while (my %i = caller_info(++$i)) {
-Carp::caller_info(/usr/share/perl/5.8/Carp/Heavy.pm:12):
-12:       my $i = shift(@_) + 1;
-13:       package DB;
-14:
-15:
-16:
-17:
-18:
-19:
-20:
-21:
-22:
-23:
-24:
-25:
-26:
-27:
-28:
-29:
-30:
-31:
-32:
-33:
-34:
-35:
-Carp::ret_backtrace(/usr/share/perl/5.8/Carp/Heavy.pm:141):
-141:      return $mess;
-Error connecting @! at t/01_connect line 9
- at t/01_connect line 9
-Debugged program terminated.  Use q to quit or R to restart,
-  use o inhibit_exit to avoid stopping after program termination,
-  h q, h R or h o to get additional info.  
-  DB<1>  q
-IO::Handle::DESTROY(/usr/lib/perl/5.8/IO/Handle.pm:75):
-75:     sub DESTROY {}
-IO::Handle::DESTROY(/usr/lib/perl/5.8/IO/Handle.pm:75):
-75:     sub DESTROY {}
-Config::DESTROY(/usr/lib/perl/5.8/Config.pm:62):
-62:     sub DESTROY { }
-IO::Handle::DESTROY(/usr/lib/perl/5.8/IO/Handle.pm:75):
-75:     sub DESTROY {}
-IO::Handle::DESTROY(/usr/lib/perl/5.8/IO/Handle.pm:75):
-75:     sub DESTROY {}
-83$ 
-
diff --git a/t/01_connect_2.99_02.dump_2 b/t/01_connect_2.99_02.dump_2
deleted file mode 100644
index 1c7a488..0000000
--- a/t/01_connect_2.99_02.dump_2
+++ /dev/null
@@ -1,6540 +0,0 @@
-entering CODE(0x814f834)
- 3:	use Carp;
- 3:	use Carp;
- 3:	use Carp;
- entering Exporter::import
-  30:	  my $pkg = shift;
-  31:	  my $callpkg = caller($ExportLevel);
-  33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-  39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-  39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-  39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-  40:	  return export $pkg, $callpkg, @_
-  41:	    if $Verbose or $Debug or @$fail > 1;
-  42:	  my $export_cache = ($Cache{$pkg} ||= {});
-  43:	  my $args = @_ or @_ = @$exports;
-  45:	  local $_;
-  46:	  if ($args and not %$export_cache) {
-  50:	  my $heavy;
-  53:	  if ($args or $fail) {
-  54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-  55:	               or @$fail and $_ eq $fail->[0])) and last
-  56:	                 foreach (@_);
-  56:	                 foreach (@_);
-  61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-  63:		sub {require Carp; &Carp::carp};
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-entering CODE(0x814f864)
- 4:	use Mail::IMAPClient;
- entering CODE(0x822c17c)
-  5:	use Mail::IMAPClient::MessageSet;
-  entering CODE(0x822bc54)
-   4:	use warnings;
-   4:	use warnings;
-   4:	use warnings;
-   entering warnings::import
-    213:	    shift;
-    215:	    my $catmask ;
-    216:	    my $fatal = 0 ;
-    217:	    my $no_fatal = 0 ;
-    219:	    my $mask = ${^WARNING_BITS} ;
-    221:	    if (vec($mask, $Offsets{'all'}, 1)) {
-    222:	        $mask |= $Bits{'all'} ;
-    223:	        $mask |= $DeadBits{'all'} if vec($mask, $Offsets{'all'}+1, 1);
-    226:	    push @_, 'all' unless @_;
-    228:	    foreach my $word ( @_ ) {
-    229:		if ($word eq 'FATAL') {
-    238:		    $mask |= $catmask ;
-    239:		    $mask |= $DeadBits{$word} if $fatal ;
-    240:		    $mask &= ~($DeadBits{$word}|$All) if $no_fatal ;
-    246:	    ${^WARNING_BITS} = $mask ;
-  entering CODE(0x822bccc)
-   5:	use strict;
-   5:	use strict;
-   5:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x822bc84)
-   19:	  , fallback => 1;
-   entering CODE(0x83227c8)
-    131:	use warnings::register;
-    Package /usr/share/perl/5.8/warnings/register.pm.
-    3:	our $VERSION = '1.01';
-    5:	require warnings;
-    32:	1;
-    131:	use warnings::register;
-    131:	use warnings::register;
-    entering warnings::register::import
-     18:	    shift;
-     19:	    my $package = (caller(0))[0];
-     20:	    if (! defined $warnings::Bits{$package}) {
-     21:	        $warnings::Bits{$package}     = mkMask($warnings::LAST_BIT);
-     entering warnings::register::mkMask
-      9:	    my ($bit) = @_;
-      10:	    my $mask = "";
-      12:	    vec($mask, $bit, 1) = 1;
-      13:	    return $mask;
-     22:	        vec($warnings::Bits{'all'}, $warnings::LAST_BIT, 1) = 1;
-     23:	        $warnings::Offsets{$package}  = $warnings::LAST_BIT ++;
-     24:		foreach my $k (keys %warnings::Bits) {
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     27:	        $warnings::DeadBits{$package} = mkMask($warnings::LAST_BIT);
-     entering warnings::register::mkMask
-      9:	    my ($bit) = @_;
-      10:	    my $mask = "";
-      12:	    vec($mask, $bit, 1) = 1;
-      13:	    return $mask;
-     28:	        vec($warnings::DeadBits{'all'}, $warnings::LAST_BIT++, 1) = 1;
-   Package /usr/share/perl/5.8/overload.pm.
-   3:	our $VERSION = '1.04';
-   5:	$overload::hint_bits = 0x20000; # HINT_LOCALIZE_HH
-   96:	*StrVal = *AddrRef;
-   109:	%constants = (
-   110:		      'integer'	  =>  0x1000, # HINT_NEW_INTEGER
-   111:		      'float'	  =>  0x2000, # HINT_NEW_FLOAT
-   112:		      'binary'	  =>  0x4000, # HINT_NEW_BINARY
-   113:		      'q'	  =>  0x8000, # HINT_NEW_STRING
-   114:		      'qr'	  => 0x10000, # HINT_NEW_RE
-   115:		     );
-   117:	%ops = ( with_assign	  => "+ - * / % ** << >> x .",
-   118:		 assign		  => "+= -= *= /= %= **= <<= >>= x= .=",
-   119:		 num_comparison	  => "< <= >  >= == !=",
-   120:		 '3way_comparison'=> "<=> cmp",
-   121:		 str_comparison	  => "lt le gt ge eq ne",
-   122:		 binary		  => "& | ^",
-   123:		 unary		  => "neg ! ~",
-   124:		 mutators	  => '++ --',
-   125:		 func		  => "atan2 cos sin exp abs log sqrt int",
-   126:		 conversion	  => 'bool "" 0+',
-   127:		 iterators	  => '<>',
-   128:		 dereferencing	  => '${} @{} %{} &{} *{}',
-   129:		 special	  => 'nomethod fallback =');
-   167:	1;
-   19:	  , fallback => 1;
-   18:	  , '@{}'    => "unfold"
-   entering overload::import
-    32:	  $package = (caller())[0];
-    34:	  shift;
-    35:	  $package->overload::OVERLOAD(@_);
-    entering overload::OVERLOAD
-     10:	  $package = shift;
-     11:	  my %arg = @_;
-     12:	  my ($sub, $fb);
-     13:	  $ {$package . "::OVERLOAD"}{dummy}++; # Register with magic by touching.
-     13:	  $ {$package . "::OVERLOAD"}{dummy}++; # Register with magic by touching.
-     14:	  *{$package . "::()"} = \&nil; # Make it findable via fetchmethod.
-     14:	  *{$package . "::()"} = \&nil; # Make it findable via fetchmethod.
-     15:	  for (keys %arg) {
-     16:	    if ($_ eq 'fallback') {
-     19:	      $sub = $arg{$_};
-     20:	      if (not ref $sub and $sub !~ /::/) {
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     16:	    if ($_ eq 'fallback') {
-     19:	      $sub = $arg{$_};
-     20:	      if (not ref $sub and $sub !~ /::/) {
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     16:	    if ($_ eq 'fallback') {
-     19:	      $sub = $arg{$_};
-     20:	      if (not ref $sub and $sub !~ /::/) {
-     21:		$ {$package . "::(" . $_} = $sub;
-     21:		$ {$package . "::(" . $_} = $sub;
-     22:		$sub = \&nil;
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     16:	    if ($_ eq 'fallback') {
-     19:	      $sub = $arg{$_};
-     20:	      if (not ref $sub and $sub !~ /::/) {
-     21:		$ {$package . "::(" . $_} = $sub;
-     21:		$ {$package . "::(" . $_} = $sub;
-     22:		$sub = \&nil;
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     16:	    if ($_ eq 'fallback') {
-     19:	      $sub = $arg{$_};
-     20:	      if (not ref $sub and $sub !~ /::/) {
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     25:	      *{$package . "::(" . $_} = \&{ $sub };
-     16:	    if ($_ eq 'fallback') {
-     17:	      $fb = $arg{$_};
-     28:	  ${$package . "::()"} = $fb; # Make it findable too (fallback only).
-     28:	  ${$package . "::()"} = $fb; # Make it findable too (fallback only).
-  Package Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient/MessageSet.pm.
-  285:	1;
-  5:	use Mail::IMAPClient::MessageSet;
-  5:	use Mail::IMAPClient::MessageSet;
- entering CODE(0x822c134)
-  7:	use Socket();
-  entering CODE(0x816f734)
-   6:	use Carp;
-   6:	use Carp;
-   6:	use Carp;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x816f740)
-   7:	use warnings::register;
-   7:	use warnings::register;
-   7:	use warnings::register;
-   entering warnings::register::import
-    18:	    shift;
-    19:	    my $package = (caller(0))[0];
-    20:	    if (! defined $warnings::Bits{$package}) {
-    21:	        $warnings::Bits{$package}     = mkMask($warnings::LAST_BIT);
-    entering warnings::register::mkMask
-     9:	    my ($bit) = @_;
-     10:	    my $mask = "";
-     12:	    vec($mask, $bit, 1) = 1;
-     13:	    return $mask;
-    22:	        vec($warnings::Bits{'all'}, $warnings::LAST_BIT, 1) = 1;
-    23:	        $warnings::Offsets{$package}  = $warnings::LAST_BIT ++;
-    24:		foreach my $k (keys %warnings::Bits) {
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    27:	        $warnings::DeadBits{$package} = mkMask($warnings::LAST_BIT);
-    entering warnings::register::mkMask
-     9:	    my ($bit) = @_;
-     10:	    my $mask = "";
-     12:	    vec($mask, $bit, 1) = 1;
-     13:	    return $mask;
-    28:	        vec($warnings::DeadBits{'all'}, $warnings::LAST_BIT++, 1) = 1;
-  entering CODE(0x816f8d8)
-   10:	use XSLoader ();
-   10:	use XSLoader ();
-   10:	use XSLoader ();
-  entering CODE(0x83e0010)
-   180:	BEGIN {
-  Package /usr/lib/perl/5.8/Socket.pm.
-  3:	our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-  4:	$VERSION = "1.78";
-  9:	require Exporter;
-  11:	@ISA = qw(Exporter);
-  12:	@EXPORT = qw(
-  13:		inet_aton inet_ntoa
-  14:		sockaddr_family
-  15:		pack_sockaddr_in unpack_sockaddr_in
-  16:		pack_sockaddr_un unpack_sockaddr_un
-  17:		sockaddr_in sockaddr_un
-  18:		INADDR_ANY INADDR_BROADCAST INADDR_LOOPBACK INADDR_NONE
-  19:		AF_802
-  20:		AF_AAL
-  21:		AF_APPLETALK
-  22:		AF_CCITT
-  23:		AF_CHAOS
-  24:		AF_CTF
-  25:		AF_DATAKIT
-  26:		AF_DECnet
-  27:		AF_DLI
-  28:		AF_ECMA
-  29:		AF_GOSIP
-  30:		AF_HYLINK
-  31:		AF_IMPLINK
-  32:		AF_INET
-  33:		AF_INET6
-  34:		AF_ISO
-  35:		AF_KEY
-  36:		AF_LAST
-  37:		AF_LAT
-  38:		AF_LINK
-  39:		AF_MAX
-  40:		AF_NBS
-  41:		AF_NIT
-  42:		AF_NS
-  43:		AF_OSI
-  44:		AF_OSINET
-  45:		AF_PUP
-  46:		AF_ROUTE
-  47:		AF_SNA
-  48:		AF_UNIX
-  49:		AF_UNSPEC
-  50:		AF_USER
-  51:		AF_WAN
-  52:		AF_X25
-  53:		IOV_MAX
-  54:		MSG_BCAST
-  55:		MSG_BTAG
-  56:		MSG_CTLFLAGS
-  57:		MSG_CTLIGNORE
-  58:		MSG_CTRUNC
-  59:		MSG_DONTROUTE
-  60:		MSG_DONTWAIT
-  61:		MSG_EOF
-  62:		MSG_EOR
-  63:		MSG_ERRQUEUE
-  64:		MSG_ETAG
-  65:		MSG_FIN
-  66:		MSG_MAXIOVLEN
-  67:		MSG_MCAST
-  68:		MSG_NOSIGNAL
-  69:		MSG_OOB
-  70:		MSG_PEEK
-  71:		MSG_PROXY
-  72:		MSG_RST
-  73:		MSG_SYN
-  74:		MSG_TRUNC
-  75:		MSG_URG
-  76:		MSG_WAITALL
-  77:		MSG_WIRE
-  78:		PF_802
-  79:		PF_AAL
-  80:		PF_APPLETALK
-  81:		PF_CCITT
-  82:		PF_CHAOS
-  83:		PF_CTF
-  84:		PF_DATAKIT
-  85:		PF_DECnet
-  86:		PF_DLI
-  87:		PF_ECMA
-  88:		PF_GOSIP
-  89:		PF_HYLINK
-  90:		PF_IMPLINK
-  91:		PF_INET
-  92:		PF_INET6
-  93:		PF_ISO
-  94:		PF_KEY
-  95:		PF_LAST
-  96:		PF_LAT
-  97:		PF_LINK
-  98:		PF_MAX
-  99:		PF_NBS
-  100:		PF_NIT
-  101:		PF_NS
-  102:		PF_OSI
-  103:		PF_OSINET
-  104:		PF_PUP
-  105:		PF_ROUTE
-  106:		PF_SNA
-  107:		PF_UNIX
-  108:		PF_UNSPEC
-  109:		PF_USER
-  110:		PF_WAN
-  111:		PF_X25
-  112:		SCM_CONNECT
-  113:		SCM_CREDENTIALS
-  114:		SCM_CREDS
-  115:		SCM_RIGHTS
-  116:		SCM_TIMESTAMP
-  117:		SHUT_RD
-  118:		SHUT_RDWR
-  119:		SHUT_WR
-  120:		SOCK_DGRAM
-  121:		SOCK_RAW
-  122:		SOCK_RDM
-  123:		SOCK_SEQPACKET
-  124:		SOCK_STREAM
-  125:		SOL_SOCKET
-  126:		SOMAXCONN
-  127:		SO_ACCEPTCONN
-  128:		SO_ATTACH_FILTER
-  129:		SO_BACKLOG
-  130:		SO_BROADCAST
-  131:		SO_CHAMELEON
-  132:		SO_DEBUG
-  133:		SO_DETACH_FILTER
-  134:		SO_DGRAM_ERRIND
-  135:		SO_DONTLINGER
-  136:		SO_DONTROUTE
-  137:		SO_ERROR
-  138:		SO_FAMILY
-  139:		SO_KEEPALIVE
-  140:		SO_LINGER
-  141:		SO_OOBINLINE
-  142:		SO_PASSCRED
-  143:		SO_PASSIFNAME
-  144:		SO_PEERCRED
-  145:		SO_PROTOCOL
-  146:		SO_PROTOTYPE
-  147:		SO_RCVBUF
-  148:		SO_RCVLOWAT
-  149:		SO_RCVTIMEO
-  150:		SO_REUSEADDR
-  151:		SO_REUSEPORT
-  152:		SO_SECURITY_AUTHENTICATION
-  153:		SO_SECURITY_ENCRYPTION_NETWORK
-  154:		SO_SECURITY_ENCRYPTION_TRANSPORT
-  155:		SO_SNDBUF
-  156:		SO_SNDLOWAT
-  157:		SO_SNDTIMEO
-  158:		SO_STATE
-  159:		SO_TYPE
-  160:		SO_USELOOPBACK
-  161:		SO_XOPEN
-  162:		SO_XSE
-  163:		UIO_MAXIOV
-  164:	);
-  166:	@EXPORT_OK = qw(CR LF CRLF $CR $LF $CRLF
-  175:	%EXPORT_TAGS = (
-  176:	    crlf    => [qw(CR LF CRLF $CR $LF $CRLF)],
-  177:	    all     => [@EXPORT, @EXPORT_OK],
-  178:	);
-  186:	*CR   = \CR();
-  187:	*LF   = \LF();
-  188:	*CRLF = \CRLF();
-  227:	XSLoader::load 'Socket', $VERSION;
-  entering XSLoader::load
-   25:	    die q{XSLoader::load('Your::Module', $Your::Module::VERSION)} unless @_;
-   27:	    my($module) = $_[0];
-   30:	    my $b = "$module\::bootstrap";
-   31:	    goto &$b if defined &$b;
-   33:	    goto retry unless $module and defined &dl_load_file;
-   35:	    my @modparts = split(/::/,$module);
-   36:	    my $modfname = $modparts[-1];
-   38:	    my $modpname = join('/',@modparts);
-   39:	    my $modlibname = (caller())[1];
-   40:	    my $c = @modparts;
-   41:	    $modlibname =~ s,[\\/][^\\/]+$,, while $c--;	# Q&D basename
-   42:	    my $file = "$modlibname/auto/$modpname/$modfname.$dl_dlext";
-   46:	    my $bs = $file;
-   47:	    $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; # look for .bs 'beside' the library
-   49:	    goto retry if not -f $file or -s $bs;
-   51:	    my $bootname = "boot_$module";
-   52:	    $bootname =~ s/\W/_/g;
-   53:	    @DynaLoader::dl_require_symbols = ($bootname);
-   55:	    my $boot_symbol_ref;
-   57:	    if ($^O eq 'darwin') {
-   70:	    my $libref = dl_load_file($file, 0) or do { 
-   entering DynaLoader::dl_load_file
-   74:	    push(@DynaLoader::dl_librefs,$libref);  # record loaded object
-   76:	    my @unresolved = dl_undef_symbols();
-   entering DynaLoader::dl_undef_symbols
-   77:	    if (@unresolved) {
-   82:	    $boot_symbol_ref = dl_find_symbol($libref, $bootname) or do {
-   entering DynaLoader::dl_find_symbol
-   87:	    push(@DynaLoader::dl_modules, $module); # record loaded module
-   89:	  boot:
-   90:	    my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
-   entering DynaLoader::dl_install_xsub
-   93:	    return &$xs(@_);
-   entering Socket::bootstrap
-  229:	1;
-  7:	use Socket();
-  7:	use Socket();
- entering CODE(0x822c194)
-  8:	use IO::Socket();
-  entering CODE(0x83dfe84)
-   11:	use IO::Handle;
-   11:	use IO::Handle;
-   11:	use IO::Handle;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x83dfde8)
-   12:	use Socket 1.3;
-   12:	use Socket 1.3;
-   entering UNIVERSAL::VERSION
-   12:	use Socket 1.3;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x83dfd7c)
-   13:	use Carp;
-   13:	use Carp;
-   13:	use Carp;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x83dfcbc)
-   14:	use strict;
-   14:	use strict;
-   14:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x83ed0e4)
-   16:	use Exporter;
-   16:	use Exporter;
-   16:	use Exporter;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x83ed18c)
-   17:	use Errno;
-   entering CODE(0x83ed558)
-    7:	use Exporter ();
-    7:	use Exporter ();
-    7:	use Exporter ();
-   entering CODE(0x83ed564)
-    8:	use strict;
-    8:	use strict;
-    8:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x841c170)
-    187:		no strict 'refs';
-    187:		no strict 'refs';
-    187:		no strict 'refs';
-    entering strict::unimport
-     33:	    shift;
-     34:	    $^H &= ~ (@_ ? bits(@_) : $default_bits);
-     entering strict::bits
-      12:	    my $bits = 0;
-      13:	    my @wrong;
-      14:	    foreach my $s (@_) {
-      15:		push @wrong, $s unless exists $bitmask{$s};
-      16:	        $bits |= $bitmask{$s} || 0;
-      18:	    if (@wrong) {
-      22:	    $bits;
-   Package /usr/lib/perl/5.8/Errno.pm.
-   6:	our (@EXPORT_OK,%EXPORT_TAGS,@ISA,$VERSION,%errno,$AUTOLOAD);
-   10:	$VERSION = "1.09_01";
-   11:	$VERSION = eval $VERSION;
-   1:	1.09_01
-   12:	@ISA = qw(Exporter);
-   14:	@EXPORT_OK = qw(EBADR ENOMSG ENOTSUP ESTRPIPE EADDRINUSE EL3HLT EBADF
-   15:		ENOTBLK ENAVAIL ECHRNG ENOTNAM ELNRNG ENOKEY EXDEV EBADE EBADSLT
-   16:		ECONNREFUSED ENOSTR ENONET EOVERFLOW EISCONN EFBIG EKEYREVOKED
-   17:		ECONNRESET EWOULDBLOCK ELIBMAX EREMOTEIO ENOPKG ELIBSCN EDESTADDRREQ
-   18:		ENOTSOCK EIO EMEDIUMTYPE EINPROGRESS ERANGE EAFNOSUPPORT EADDRNOTAVAIL
-   19:		EINTR EREMOTE EILSEQ ENOMEM EPIPE ENETUNREACH ENODATA EUSERS
-   20:		EOPNOTSUPP EPROTO EISNAM ESPIPE EALREADY ENAMETOOLONG ENOEXEC EISDIR
-   21:		EBADRQC EEXIST EDOTDOT ELIBBAD EOWNERDEAD ESRCH EFAULT EXFULL
-   22:		EDEADLOCK EAGAIN ENOPROTOOPT ENETDOWN EPROTOTYPE EL2NSYNC ENETRESET
-   23:		EUCLEAN EADV EROFS ESHUTDOWN EMULTIHOP EPROTONOSUPPORT ENFILE ENOLCK
-   24:		ECONNABORTED ECANCELED EDEADLK ESRMNT ENOLINK ETIME ENOTDIR EINVAL
-   25:		ENOTTY ENOANO ELOOP ENOENT EPFNOSUPPORT EBADMSG ENOMEDIUM EL2HLT EDOM
-   26:		EBFONT EKEYEXPIRED EMSGSIZE ENOCSI EL3RST ENOSPC EIDRM ENOBUFS ENOSYS
-   27:		EHOSTDOWN EBADFD ENOSR ENOTCONN ESTALE EDQUOT EKEYREJECTED EMFILE
-   28:		ENOTRECOVERABLE EACCES EBUSY E2BIG EPERM ELIBEXEC ETOOMANYREFS ELIBACC
-   29:		ENOTUNIQ ECOMM ERESTART ESOCKTNOSUPPORT EUNATCH ETIMEDOUT ENXIO ENODEV
-   30:		ETXTBSY EMLINK ECHILD EHOSTUNREACH EREMCHG ENOTEMPTY);
-   32:	%EXPORT_TAGS = (
-   33:	    POSIX => [qw(
-   34:		E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EAFNOSUPPORT EAGAIN EALREADY
-   35:		EBADF EBUSY ECHILD ECONNABORTED ECONNREFUSED ECONNRESET EDEADLK
-   36:		EDESTADDRREQ EDOM EDQUOT EEXIST EFAULT EFBIG EHOSTDOWN EHOSTUNREACH
-   37:		EINPROGRESS EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK
-   38:		EMSGSIZE ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH ENFILE ENOBUFS
-   39:		ENODEV ENOENT ENOEXEC ENOLCK ENOMEM ENOPROTOOPT ENOSPC ENOSYS ENOTBLK
-   40:		ENOTCONN ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM
-   41:		EPFNOSUPPORT EPIPE EPROTONOSUPPORT EPROTOTYPE ERANGE EREMOTE ERESTART
-   42:		EROFS ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESTALE ETIMEDOUT
-   43:		ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK EXDEV
-   44:	    )]
-   45:	);
-   199:	*CLEAR = \&STORE;
-   200:	*DELETE = \&STORE;
-   223:	tie %!, __PACKAGE__;
-   entering Errno::TIEHASH
-    180:	sub TIEHASH { bless [] }
-   225:	1;
-   226:	__END__
-   17:	use Errno;
-   17:	use Errno;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  Package /usr/lib/perl/5.8/IO/Socket.pm.
-  9:	require 5.006;
-  15:	our(@ISA, $VERSION, @EXPORT_OK);
-  21:	require IO::Socket::INET;
-  entering CODE(0x842f0d4)
-   9:	use strict;
-   9:	use strict;
-   9:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x843e0dc)
-   11:	use IO::Socket;
-   11:	use IO::Socket;
-   11:	use IO::Socket;
-   entering IO::Socket::import
-    31:	    my $pkg = shift;
-    32:	    if (@_ && $_[0] eq 'sockatmark') { # not very extensible but for now, fast
-    35:		my $callpkg = caller;
-    36:		Exporter::export 'Socket', $callpkg, @_;
-    entering Exporter::export
-     26:	  goto &{as_heavy()};
-     26:	  goto &{as_heavy()};
-     entering Exporter::as_heavy
-      17:	  require Exporter::Heavy;
-      entering CODE(0x843e2b0)
-       3:	use strict;
-       3:	use strict;
-       3:	use strict;
-       entering strict::import
-        28:	    shift;
-        29:	    $^H |= @_ ? bits(@_) : $default_bits;
-      entering CODE(0x843e2bc)
-       4:	no strict 'refs';
-       4:	no strict 'refs';
-       4:	no strict 'refs';
-       entering strict::unimport
-        33:	    shift;
-        34:	    $^H &= ~ (@_ ? bits(@_) : $default_bits);
-        entering strict::bits
-         12:	    my $bits = 0;
-         13:	    my @wrong;
-         14:	    foreach my $s (@_) {
-         15:		push @wrong, $s unless exists $bitmask{$s};
-         16:	        $bits |= $bitmask{$s} || 0;
-         18:	    if (@wrong) {
-         22:	    $bits;
-      Package /usr/share/perl/5.8/Exporter/Heavy.pm.
-      7:	require Exporter;  our $VERSION = $Exporter::VERSION;
-      7:	require Exporter;  our $VERSION = $Exporter::VERSION;
-      8:	$Carp::Internal{"Exporter::Heavy"} = 1;
-      234:	1;
-      20:	  my $c = (caller(1))[3];
-      21:	  $c =~ s/.*:://;
-      22:	  \&{"Exporter::Heavy::heavy_$c"};
-      22:	  \&{"Exporter::Heavy::heavy_$c"};
-     39:	    };
-     40:	    local $SIG{__DIE__} = sub {
-     45:	    };
-     47:	    my($pkg, $callpkg, @imports) = @_;
-     48:	    my($type, $sym, $cache_is_current, $oops);
-     49:	    my($exports, $export_cache) = (\@{"${pkg}::EXPORT"},
-     50:	                                   $Exporter::Cache{$pkg} ||= {});
-     49:	    my($exports, $export_cache) = (\@{"${pkg}::EXPORT"},
-     50:	                                   $Exporter::Cache{$pkg} ||= {});
-     52:	    if (@imports) {
-     145:		@imports = @$exports;
-     148:	    my($fail, $fail_cache) = (\@{"${pkg}::EXPORT_FAIL"},
-     149:	                              $Exporter::FailCache{$pkg} ||= {});
-     148:	    my($fail, $fail_cache) = (\@{"${pkg}::EXPORT_FAIL"},
-     149:	                              $Exporter::FailCache{$pkg} ||= {});
-     151:	    if (@$fail) {
-     176:	    warn "Importing into $callpkg from $pkg: ",
-     177:			join(", ",sort @imports) if $Exporter::Verbose;
-     179:	    foreach $sym (@imports) {
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-  entering CODE(0x843e0f4)
-   12:	use Socket;
-   12:	use Socket;
-   12:	use Socket;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x83ed5e8)
-   13:	use Carp;
-   13:	use Carp;
-   13:	use Carp;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x843e100)
-   14:	use Exporter;
-   14:	use Exporter;
-   14:	use Exporter;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x843e118)
-   15:	use Errno;
-   15:	use Errno;
-   15:	use Errno;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  Package /usr/lib/perl/5.8/IO/Socket/INET.pm.
-  10:	our(@ISA, $VERSION);
-  17:	@ISA = qw(IO::Socket);
-  18:	$VERSION = "1.29";
-  20:	my $EINVAL = exists(&Errno::EINVAL) ? Errno::EINVAL() : 1;
-  22:	IO::Socket::INET->register_domain( AF_INET );
-  entering Socket::AUTOLOAD for Socket::AF_INET
-   216:	    my($constname);
-   217:	    ($constname = $AUTOLOAD) =~ s/.*:://;
-   218:	    croak "&Socket::constant not defined" if $constname eq 'constant';
-   219:	    my ($error, $val) = constant($constname);
-   entering Socket::constant
-   220:	    if ($error) {
-   223:	    *$AUTOLOAD = sub { $val };
-   224:	    goto &$AUTOLOAD;
-   223:	    *$AUTOLOAD = sub { $val };
-  entering IO::Socket::register_domain
-   55:	    my($p,$d) = @_;
-   56:	    $domain2pkg[$d] = $p;
-  24:	my %socket_type = ( tcp  => SOCK_STREAM,
-  25:			    udp  => SOCK_DGRAM,
-  26:			    icmp => SOCK_RAW
-  27:			  );
-  entering Socket::AUTOLOAD for Socket::SOCK_STREAM
-   216:	    my($constname);
-   217:	    ($constname = $AUTOLOAD) =~ s/.*:://;
-   218:	    croak "&Socket::constant not defined" if $constname eq 'constant';
-   219:	    my ($error, $val) = constant($constname);
-   entering Socket::constant
-   220:	    if ($error) {
-   223:	    *$AUTOLOAD = sub { $val };
-   224:	    goto &$AUTOLOAD;
-   223:	    *$AUTOLOAD = sub { $val };
-  entering Socket::AUTOLOAD for Socket::SOCK_DGRAM
-   216:	    my($constname);
-   217:	    ($constname = $AUTOLOAD) =~ s/.*:://;
-   218:	    croak "&Socket::constant not defined" if $constname eq 'constant';
-   219:	    my ($error, $val) = constant($constname);
-   entering Socket::constant
-   220:	    if ($error) {
-   223:	    *$AUTOLOAD = sub { $val };
-   224:	    goto &$AUTOLOAD;
-   223:	    *$AUTOLOAD = sub { $val };
-  entering Socket::AUTOLOAD for Socket::SOCK_RAW
-   216:	    my($constname);
-   217:	    ($constname = $AUTOLOAD) =~ s/.*:://;
-   218:	    croak "&Socket::constant not defined" if $constname eq 'constant';
-   219:	    my ($error, $val) = constant($constname);
-   entering Socket::constant
-   220:	    if ($error) {
-   223:	    *$AUTOLOAD = sub { $val };
-   224:	    goto &$AUTOLOAD;
-   223:	    *$AUTOLOAD = sub { $val };
-  275:	1;
-  22:	require IO::Socket::UNIX if ($^O ne 'epoc' && $^O ne 'symbian');
-  entering CODE(0x8474028)
-   9:	use strict;
-   9:	use strict;
-   9:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x8474100)
-   11:	use IO::Socket;
-   11:	use IO::Socket;
-   11:	use IO::Socket;
-   entering IO::Socket::import
-    31:	    my $pkg = shift;
-    32:	    if (@_ && $_[0] eq 'sockatmark') { # not very extensible but for now, fast
-    35:		my $callpkg = caller;
-    36:		Exporter::export 'Socket', $callpkg, @_;
-    entering Exporter::export
-     26:	  goto &{as_heavy()};
-     26:	  goto &{as_heavy()};
-     entering Exporter::as_heavy
-      17:	  require Exporter::Heavy;
-      20:	  my $c = (caller(1))[3];
-      21:	  $c =~ s/.*:://;
-      22:	  \&{"Exporter::Heavy::heavy_$c"};
-      22:	  \&{"Exporter::Heavy::heavy_$c"};
-     39:	    };
-     40:	    local $SIG{__DIE__} = sub {
-     45:	    };
-     47:	    my($pkg, $callpkg, @imports) = @_;
-     48:	    my($type, $sym, $cache_is_current, $oops);
-     49:	    my($exports, $export_cache) = (\@{"${pkg}::EXPORT"},
-     50:	                                   $Exporter::Cache{$pkg} ||= {});
-     49:	    my($exports, $export_cache) = (\@{"${pkg}::EXPORT"},
-     50:	                                   $Exporter::Cache{$pkg} ||= {});
-     52:	    if (@imports) {
-     145:		@imports = @$exports;
-     148:	    my($fail, $fail_cache) = (\@{"${pkg}::EXPORT_FAIL"},
-     149:	                              $Exporter::FailCache{$pkg} ||= {});
-     148:	    my($fail, $fail_cache) = (\@{"${pkg}::EXPORT_FAIL"},
-     149:	                              $Exporter::FailCache{$pkg} ||= {});
-     151:	    if (@$fail) {
-     176:	    warn "Importing into $callpkg from $pkg: ",
-     177:			join(", ",sort @imports) if $Exporter::Verbose;
-     179:	    foreach $sym (@imports) {
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-     181:		(*{"${callpkg}::$sym"} = \&{"${pkg}::$sym"}, next)
-     182:		    unless $sym =~ s/^(\W)//;
-  entering CODE(0x8474118)
-   12:	use Socket;
-   12:	use Socket;
-   12:	use Socket;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x8473f44)
-   13:	use Carp;
-   13:	use Carp;
-   13:	use Carp;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  Package /usr/lib/perl/5.8/IO/Socket/UNIX.pm.
-  10:	our(@ISA, $VERSION);
-  15:	@ISA = qw(IO::Socket);
-  16:	$VERSION = "1.22";
-  17:	$VERSION = eval $VERSION;
-  1:	1.22
-  19:	IO::Socket::UNIX->register_domain( AF_UNIX );
-  entering Socket::AUTOLOAD for Socket::AF_UNIX
-   216:	    my($constname);
-   217:	    ($constname = $AUTOLOAD) =~ s/.*:://;
-   218:	    croak "&Socket::constant not defined" if $constname eq 'constant';
-   219:	    my ($error, $val) = constant($constname);
-   entering Socket::constant
-   220:	    if ($error) {
-   223:	    *$AUTOLOAD = sub { $val };
-   224:	    goto &$AUTOLOAD;
-   223:	    *$AUTOLOAD = sub { $val };
-  entering IO::Socket::register_domain
-   55:	    my($p,$d) = @_;
-   56:	    $domain2pkg[$d] = $p;
-  66:	1; # Keep require happy
-  24:	@ISA = qw(IO::Handle);
-  26:	$VERSION = "1.29";
-  28:	@EXPORT_OK = qw(sockatmark);
-  52:	my @domain2pkg;
-  250:	my $intsize = length(pack("i",0));
-  302:	1;
-  8:	use IO::Socket();
-  8:	use IO::Socket();
- entering CODE(0x822c044)
-  9:	use IO::Select();
-  entering CODE(0x8483648)
-   9:	use     strict;
-   9:	use     strict;
-   9:	use     strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x8483630)
-   10:	use warnings::register;
-   10:	use warnings::register;
-   10:	use warnings::register;
-   entering warnings::register::import
-    18:	    shift;
-    19:	    my $package = (caller(0))[0];
-    20:	    if (! defined $warnings::Bits{$package}) {
-    21:	        $warnings::Bits{$package}     = mkMask($warnings::LAST_BIT);
-    entering warnings::register::mkMask
-     9:	    my ($bit) = @_;
-     10:	    my $mask = "";
-     12:	    vec($mask, $bit, 1) = 1;
-     13:	    return $mask;
-    22:	        vec($warnings::Bits{'all'}, $warnings::LAST_BIT, 1) = 1;
-    23:	        $warnings::Offsets{$package}  = $warnings::LAST_BIT ++;
-    24:		foreach my $k (keys %warnings::Bits) {
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    27:	        $warnings::DeadBits{$package} = mkMask($warnings::LAST_BIT);
-    entering warnings::register::mkMask
-     9:	    my ($bit) = @_;
-     10:	    my $mask = "";
-     12:	    vec($mask, $bit, 1) = 1;
-     13:	    return $mask;
-    28:	        vec($warnings::DeadBits{'all'}, $warnings::LAST_BIT++, 1) = 1;
-  entering CODE(0x8483690)
-   11:	use     vars qw($VERSION @ISA);
-   entering CODE(0x84838a0)
-    3:	use 5.006;
-    3:	use 5.006;
-    3:	use 5.006;
-   entering CODE(0x8483984)
-    7:	use warnings::register;
-    7:	use warnings::register;
-    7:	use warnings::register;
-    entering warnings::register::import
-     18:	    shift;
-     19:	    my $package = (caller(0))[0];
-     20:	    if (! defined $warnings::Bits{$package}) {
-     21:	        $warnings::Bits{$package}     = mkMask($warnings::LAST_BIT);
-     entering warnings::register::mkMask
-      9:	    my ($bit) = @_;
-      10:	    my $mask = "";
-      12:	    vec($mask, $bit, 1) = 1;
-      13:	    return $mask;
-     22:	        vec($warnings::Bits{'all'}, $warnings::LAST_BIT, 1) = 1;
-     23:	        $warnings::Offsets{$package}  = $warnings::LAST_BIT ++;
-     24:		foreach my $k (keys %warnings::Bits) {
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-     27:	        $warnings::DeadBits{$package} = mkMask($warnings::LAST_BIT);
-     entering warnings::register::mkMask
-      9:	    my ($bit) = @_;
-      10:	    my $mask = "";
-      12:	    vec($mask, $bit, 1) = 1;
-      13:	    return $mask;
-     28:	        vec($warnings::DeadBits{'all'}, $warnings::LAST_BIT++, 1) = 1;
-   entering CODE(0x8483978)
-    8:	use strict qw(vars subs);
-    8:	use strict qw(vars subs);
-    8:	use strict qw(vars subs);
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-     entering strict::bits
-      12:	    my $bits = 0;
-      13:	    my @wrong;
-      14:	    foreach my $s (@_) {
-      15:		push @wrong, $s unless exists $bitmask{$s};
-      16:	        $bits |= $bitmask{$s} || 0;
-      15:		push @wrong, $s unless exists $bitmask{$s};
-      16:	        $bits |= $bitmask{$s} || 0;
-      18:	    if (@wrong) {
-      22:	    $bits;
-   Package /usr/share/perl/5.8/vars.pm.
-   5:	our $VERSION = '1.01';
-   46:	1;
-   47:	__END__
-   11:	use     vars qw($VERSION @ISA);
-   11:	use     vars qw($VERSION @ISA);
-   entering vars::import
-    11:	    my $callpack = caller;
-    12:	    my ($pack, @imports) = @_;
-    13:	    my ($sym, $ch);
-    14:	    foreach (@imports) {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-  Package /usr/lib/perl/5.8/IO/Select.pm.
-  12:	require Exporter;
-  14:	$VERSION = "1.17";
-  16:	@ISA = qw(Exporter); # This is only so we can do version checking
-  231:	1;
-  232:	__END__
-  9:	use IO::Select();
-  9:	use IO::Select();
- entering CODE(0x822c098)
-  10:	use IO::File();
-  entering CODE(0x849b3e4)
-   5:	use 5.006_001;
-   5:	use 5.006_001;
-   5:	use 5.006_001;
-  entering CODE(0x849cab8)
-   6:	use strict;
-   6:	use strict;
-   6:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x84a6b28)
-   8:	use Carp;
-   8:	use Carp;
-   8:	use Carp;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x84a6b34)
-   9:	use Symbol;
-   9:	use Symbol;
-   9:	use Symbol;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x84a6b40)
-   10:	use SelectSaver;
-   10:	use SelectSaver;
-   10:	use SelectSaver;
-  entering CODE(0x84a6b4c)
-   11:	use IO::Seekable;
-   entering CODE(0x84a6db0)
-    5:	use 5.006_001;
-    5:	use 5.006_001;
-    5:	use 5.006_001;
-   entering CODE(0x84a6dbc)
-    6:	use Carp;
-    6:	use Carp;
-    6:	use Carp;
-    entering Exporter::import
-     30:	  my $pkg = shift;
-     31:	  my $callpkg = caller($ExportLevel);
-     33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-     39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-     39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-     39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-     40:	  return export $pkg, $callpkg, @_
-     41:	    if $Verbose or $Debug or @$fail > 1;
-     42:	  my $export_cache = ($Cache{$pkg} ||= {});
-     43:	  my $args = @_ or @_ = @$exports;
-     45:	  local $_;
-     46:	  if ($args and not %$export_cache) {
-     50:	  my $heavy;
-     53:	  if ($args or $fail) {
-     54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-     55:	               or @$fail and $_ eq $fail->[0])) and last
-     56:	                 foreach (@_);
-     56:	                 foreach (@_);
-     61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-     63:		sub {require Carp; &Carp::carp};
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   entering CODE(0x84a6dc8)
-    7:	use strict;
-    7:	use strict;
-    7:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x84a6e64)
-    9:	use IO::Handle ();
-    9:	use IO::Handle ();
-    9:	use IO::Handle ();
-   entering CODE(0x84a6e58)
-    12:	use Fcntl qw(SEEK_SET SEEK_CUR SEEK_END);
-    entering CODE(0x84b2a20)
-     6:	use XSLoader ();
-     6:	use XSLoader ();
-     6:	use XSLoader ();
-    Package /usr/lib/perl/5.8/Fcntl.pm.
-    3:	our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $AUTOLOAD);
-    5:	require Exporter;
-    7:	@ISA = qw(Exporter);
-    8:	$VERSION = "1.05";
-    11:	@EXPORT =
-    12:	  qw(
-    13:		FD_CLOEXEC
-    14:		F_ALLOCSP
-    15:		F_ALLOCSP64
-    16:		F_COMPAT
-    17:		F_DUP2FD
-    18:		F_DUPFD
-    19:		F_EXLCK
-    20:		F_FREESP
-    21:		F_FREESP64
-    22:		F_FSYNC
-    23:		F_FSYNC64
-    24:		F_GETFD
-    25:		F_GETFL
-    26:		F_GETLK
-    27:		F_GETLK64
-    28:		F_GETOWN
-    29:		F_NODNY
-    30:		F_POSIX
-    31:		F_RDACC
-    32:		F_RDDNY
-    33:		F_RDLCK
-    34:		F_RWACC
-    35:		F_RWDNY
-    36:		F_SETFD
-    37:		F_SETFL
-    38:		F_SETLK
-    39:		F_SETLK64
-    40:		F_SETLKW
-    41:		F_SETLKW64
-    42:		F_SETOWN
-    43:		F_SHARE
-    44:		F_SHLCK
-    45:		F_UNLCK
-    46:		F_UNSHARE
-    47:		F_WRACC
-    48:		F_WRDNY
-    49:		F_WRLCK
-    50:		O_ACCMODE
-    51:		O_ALIAS
-    52:		O_APPEND
-    53:		O_ASYNC
-    54:		O_BINARY
-    55:		O_CREAT
-    56:		O_DEFER
-    57:		O_DIRECT
-    58:		O_DIRECTORY
-    59:		O_DSYNC
-    60:		O_EXCL
-    61:		O_EXLOCK
-    62:		O_LARGEFILE
-    63:		O_NDELAY
-    64:		O_NOCTTY
-    65:		O_NOFOLLOW
-    66:		O_NOINHERIT
-    67:		O_NONBLOCK
-    68:		O_RANDOM
-    69:		O_RAW
-    70:		O_RDONLY
-    71:		O_RDWR
-    72:		O_RSRC
-    73:		O_RSYNC
-    74:		O_SEQUENTIAL
-    75:		O_SHLOCK
-    76:		O_SYNC
-    77:		O_TEMPORARY
-    78:		O_TEXT
-    79:		O_TRUNC
-    80:		O_WRONLY
-    81:	     );
-    84:	@EXPORT_OK = qw(
-    85:		DN_ACCESS
-    86:		DN_ATTRIB
-    87:		DN_CREATE
-    88:		DN_DELETE
-    89:		DN_MODIFY
-    90:		DN_MULTISHOT
-    91:		DN_RENAME
-    92:		FAPPEND
-    93:		FASYNC
-    94:		FCREAT
-    95:		FDEFER
-    96:		FDSYNC
-    97:		FEXCL
-    98:		FLARGEFILE
-    99:		FNDELAY
-    100:		FNONBLOCK
-    101:		FRSYNC
-    102:		FSYNC
-    103:		FTRUNC
-    104:		F_GETLEASE
-    105:		F_GETSIG
-    106:		F_NOTIFY
-    107:		F_SETLEASE
-    108:		F_SETSIG
-    109:		LOCK_EX
-    110:		LOCK_MAND
-    111:		LOCK_NB
-    112:		LOCK_READ
-    113:		LOCK_RW
-    114:		LOCK_SH
-    115:		LOCK_UN
-    116:		LOCK_WRITE
-    117:		O_IGNORE_CTTY
-    118:		O_NOATIME
-    119:		O_NOLINK
-    120:		O_NOTRANS
-    121:		SEEK_CUR
-    122:		SEEK_END
-    123:		SEEK_SET
-    124:		S_IFSOCK S_IFBLK S_IFCHR S_IFIFO S_IFWHT S_ENFMT
-    125:		S_IREAD S_IWRITE S_IEXEC
-    126:		S_IRGRP S_IWGRP S_IXGRP S_IRWXG
-    127:		S_IROTH S_IWOTH S_IXOTH S_IRWXO
-    128:		S_IRUSR S_IWUSR S_IXUSR S_IRWXU
-    129:		S_ISUID S_ISGID S_ISVTX S_ISTXT
-    130:		_S_IFMT S_IFREG S_IFDIR S_IFLNK
-    131:		&S_ISREG &S_ISDIR &S_ISLNK &S_ISSOCK &S_ISBLK &S_ISCHR &S_ISFIFO
-    132:		&S_ISWHT &S_ISENFMT &S_IFMT &S_IMODE
-    133:	);
-    135:	%EXPORT_TAGS = (
-    136:	    'flock'   => [qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN)],
-    137:	    'Fcompat' => [qw(FAPPEND FASYNC FCREAT FDEFER FDSYNC FEXCL FLARGEFILE
-    138:			     FNDELAY FNONBLOCK FRSYNC FSYNC FTRUNC)],
-    139:	    'seek'    => [qw(SEEK_SET SEEK_CUR SEEK_END)],
-    140:	    'mode'    => [qw(S_ISUID S_ISGID S_ISVTX S_ISTXT
-    141:			     _S_IFMT S_IFREG S_IFDIR S_IFLNK
-    142:			     S_IFSOCK S_IFBLK S_IFCHR S_IFIFO S_IFWHT S_ENFMT
-    143:			     S_IRUSR S_IWUSR S_IXUSR S_IRWXU
-    144:			     S_IRGRP S_IWGRP S_IXGRP S_IRWXG
-    145:			     S_IROTH S_IWOTH S_IXOTH S_IRWXO
-    146:			     S_IREAD S_IWRITE S_IEXEC
-    147:			     S_ISREG S_ISDIR S_ISLNK S_ISSOCK
-    148:			     S_ISBLK S_ISCHR S_ISFIFO
-    149:			     S_ISWHT S_ISENFMT		
-    150:			     S_IFMT S_IMODE
-    151:	                  )],
-    152:	);
-    179:	XSLoader::load 'Fcntl', $VERSION;
-    entering XSLoader::load
-     25:	    die q{XSLoader::load('Your::Module', $Your::Module::VERSION)} unless @_;
-     27:	    my($module) = $_[0];
-     30:	    my $b = "$module\::bootstrap";
-     31:	    goto &$b if defined &$b;
-     33:	    goto retry unless $module and defined &dl_load_file;
-     35:	    my @modparts = split(/::/,$module);
-     36:	    my $modfname = $modparts[-1];
-     38:	    my $modpname = join('/',@modparts);
-     39:	    my $modlibname = (caller())[1];
-     40:	    my $c = @modparts;
-     41:	    $modlibname =~ s,[\\/][^\\/]+$,, while $c--;	# Q&D basename
-     42:	    my $file = "$modlibname/auto/$modpname/$modfname.$dl_dlext";
-     46:	    my $bs = $file;
-     47:	    $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; # look for .bs 'beside' the library
-     49:	    goto retry if not -f $file or -s $bs;
-     51:	    my $bootname = "boot_$module";
-     52:	    $bootname =~ s/\W/_/g;
-     53:	    @DynaLoader::dl_require_symbols = ($bootname);
-     55:	    my $boot_symbol_ref;
-     57:	    if ($^O eq 'darwin') {
-     70:	    my $libref = dl_load_file($file, 0) or do { 
-     entering DynaLoader::dl_load_file
-     74:	    push(@DynaLoader::dl_librefs,$libref);  # record loaded object
-     76:	    my @unresolved = dl_undef_symbols();
-     entering DynaLoader::dl_undef_symbols
-     77:	    if (@unresolved) {
-     82:	    $boot_symbol_ref = dl_find_symbol($libref, $bootname) or do {
-     entering DynaLoader::dl_find_symbol
-     87:	    push(@DynaLoader::dl_modules, $module); # record loaded module
-     89:	  boot:
-     90:	    my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
-     entering DynaLoader::dl_install_xsub
-     93:	    return &$xs(@_);
-     entering Fcntl::bootstrap
-    181:	1;
-    12:	use Fcntl qw(SEEK_SET SEEK_CUR SEEK_END);
-    12:	use Fcntl qw(SEEK_SET SEEK_CUR SEEK_END);
-    entering Exporter::import
-     30:	  my $pkg = shift;
-     31:	  my $callpkg = caller($ExportLevel);
-     33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-     39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-     39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-     39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-     40:	  return export $pkg, $callpkg, @_
-     41:	    if $Verbose or $Debug or @$fail > 1;
-     42:	  my $export_cache = ($Cache{$pkg} ||= {});
-     43:	  my $args = @_ or @_ = @$exports;
-     45:	  local $_;
-     46:	  if ($args and not %$export_cache) {
-     48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-     48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-     47:	    s/^&//, $export_cache->{$_} = 1
-     50:	  my $heavy;
-     53:	  if ($args or $fail) {
-     54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-     55:	               or @$fail and $_ eq $fail->[0])) and last
-     56:	                 foreach (@_);
-     56:	                 foreach (@_);
-     61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-     63:		sub {require Carp; &Carp::carp};
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-     65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   Package /usr/lib/perl/5.8/IO/Seekable.pm.
-   8:	our($VERSION, @EXPORT, @ISA);
-   13:	require Exporter;
-   15:	@EXPORT = qw(SEEK_SET SEEK_CUR SEEK_END);
-   16:	@ISA = qw(Exporter);
-   18:	$VERSION = "1.10";
-   19:	$VERSION = eval $VERSION;
-   1:	1.10
-   36:	1;
-   11:	use IO::Seekable;
-   11:	use IO::Seekable;
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x84a6b88)
-   12:	use File::Spec;
-   entering CODE(0x84b1c74)
-    3:	use strict;
-    3:	use strict;
-    3:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x84b1c80)
-    4:	use vars qw(@ISA $VERSION);
-    4:	use vars qw(@ISA $VERSION);
-    4:	use vars qw(@ISA $VERSION);
-    entering vars::import
-     11:	    my $callpack = caller;
-     12:	    my ($pack, @imports) = @_;
-     13:	    my ($sym, $ch);
-     14:	    foreach (@imports) {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-   Package /usr/share/perl/5.8/File/Spec.pm.
-   6:	$VERSION = '3.12';
-   7:	$VERSION = eval $VERSION;
-   1:	3.12
-   9:	my %module = (MacOS   => 'Mac',
-   10:		      MSWin32 => 'Win32',
-   11:		      os2     => 'OS2',
-   12:		      VMS     => 'VMS',
-   13:		      epoc    => 'Epoc',
-   14:		      NetWare => 'Win32', # Yes, File::Spec::Win32 works on NetWare.
-   15:		      symbian => 'Win32', # Yes, File::Spec::Win32 works on symbian.
-   16:		      dos     => 'OS2',   # Yes, File::Spec::OS2 works on DJGPP.
-   17:		      cygwin  => 'Cygwin');
-   19:	my $module = $module{$^O} || 'Unix';
-   21:	require "File/Spec/$module.pm";
-   entering CODE(0x84b20e8)
-    3:	use strict;
-    3:	use strict;
-    3:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x84b20f4)
-    4:	use vars qw($VERSION);
-    4:	use vars qw($VERSION);
-    4:	use vars qw($VERSION);
-    entering vars::import
-     11:	    my $callpack = caller;
-     12:	    my ($pack, @imports) = @_;
-     13:	    my ($sym, $ch);
-     14:	    foreach (@imports) {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-   entering CODE(0x84cda44)
-    61:		no strict 'refs';
-    61:		no strict 'refs';
-    61:		no strict 'refs';
-    entering strict::unimport
-     33:	    shift;
-     34:	    $^H &= ~ (@_ ? bits(@_) : $default_bits);
-     entering strict::bits
-      12:	    my $bits = 0;
-      13:	    my @wrong;
-      14:	    foreach my $s (@_) {
-      15:		push @wrong, $s unless exists $bitmask{$s};
-      16:	        $bits |= $bitmask{$s} || 0;
-      18:	    if (@wrong) {
-      22:	    $bits;
-   Package /usr/share/perl/5.8/File/Spec/Unix.pm.
-   6:	$VERSION = '1.5';
-   55:	my $tmpdir;
-   56:	sub _tmpdir {
-   266:	1;
-   22:	@ISA = ("File::Spec::$module");
-   24:	1;
-   12:	use File::Spec;
-   12:	use File::Spec;
-  Package /usr/lib/perl/5.8/IO/File.pm.
-  7:	our($VERSION, @EXPORT, @EXPORT_OK, @ISA);
-  14:	require Exporter;
-  16:	@ISA = qw(IO::Handle IO::Seekable Exporter);
-  18:	$VERSION = "1.13";
-  20:	@EXPORT = @IO::Seekable::EXPORT;
-  22:	eval {
-  24:	    require Fcntl;
-  25:	    my @O = grep /^O_/, @Fcntl::EXPORT;
-  26:	    Fcntl->import(@O);  # first we import what we want to export
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  27:	    push(@EXPORT, @O);
-  86:	1;
-  10:	use IO::File();
-  10:	use IO::File();
- entering CODE(0x822c188)
-  11:	use Carp qw(carp);
-  11:	use Carp qw(carp);
-  11:	use Carp qw(carp);
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   47:	    s/^&//, $export_cache->{$_} = 1
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
- entering CODE(0x843e034)
-  13:	use Fcntl       qw(F_GETFL F_SETFL O_NONBLOCK);
-  13:	use Fcntl       qw(F_GETFL F_SETFL O_NONBLOCK);
-  13:	use Fcntl       qw(F_GETFL F_SETFL O_NONBLOCK);
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
- entering CODE(0x84b1f74)
-  14:	use Errno       qw/EAGAIN/;
-  14:	use Errno       qw/EAGAIN/;
-  14:	use Errno       qw/EAGAIN/;
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   47:	    s/^&//, $export_cache->{$_} = 1
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
- entering CODE(0x84db578)
-  15:	use List::Util  qw/first min max sum/;
-  entering CODE(0x84e93e4)
-   9:	use strict;
-   9:	use strict;
-   9:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x84e93f0)
-   10:	use vars qw(@ISA @EXPORT_OK $VERSION $XS_VERSION $TESTING_PERL_ONLY);
-   10:	use vars qw(@ISA @EXPORT_OK $VERSION $XS_VERSION $TESTING_PERL_ONLY);
-   10:	use vars qw(@ISA @EXPORT_OK $VERSION $XS_VERSION $TESTING_PERL_ONLY);
-   entering vars::import
-    11:	    my $callpack = caller;
-    12:	    my ($pack, @imports) = @_;
-    13:	    my ($sym, $ch);
-    14:	    foreach (@imports) {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-  Package /usr/lib/perl/5.8/List/Util.pm.
-  11:	require Exporter;
-  13:	@ISA        = qw(Exporter);
-  14:	@EXPORT_OK  = qw(first min max minstr maxstr reduce sum shuffle);
-  15:	$VERSION    = "1.18";
-  16:	$XS_VERSION = $VERSION;
-  17:	$VERSION    = eval $VERSION;
-  1:	1.18
-  19:	eval {
-  22:	  local $ENV{PERL_DL_NONLAZY} = 0 if $ENV{PERL_DL_NONLAZY};
-  23:	  eval {
-  27:	  } or do {
-  24:	    require XSLoader;
-  25:	    XSLoader::load('List::Util', $XS_VERSION);
-  entering XSLoader::load
-   25:	    die q{XSLoader::load('Your::Module', $Your::Module::VERSION)} unless @_;
-   27:	    my($module) = $_[0];
-   30:	    my $b = "$module\::bootstrap";
-   31:	    goto &$b if defined &$b;
-   33:	    goto retry unless $module and defined &dl_load_file;
-   35:	    my @modparts = split(/::/,$module);
-   36:	    my $modfname = $modparts[-1];
-   38:	    my $modpname = join('/',@modparts);
-   39:	    my $modlibname = (caller())[1];
-   40:	    my $c = @modparts;
-   41:	    $modlibname =~ s,[\\/][^\\/]+$,, while $c--;	# Q&D basename
-   42:	    my $file = "$modlibname/auto/$modpname/$modfname.$dl_dlext";
-   46:	    my $bs = $file;
-   47:	    $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; # look for .bs 'beside' the library
-   49:	    goto retry if not -f $file or -s $bs;
-   51:	    my $bootname = "boot_$module";
-   52:	    $bootname =~ s/\W/_/g;
-   53:	    @DynaLoader::dl_require_symbols = ($bootname);
-   55:	    my $boot_symbol_ref;
-   57:	    if ($^O eq 'darwin') {
-   70:	    my $libref = dl_load_file($file, 0) or do { 
-   entering DynaLoader::dl_load_file
-   74:	    push(@DynaLoader::dl_librefs,$libref);  # record loaded object
-   76:	    my @unresolved = dl_undef_symbols();
-   entering DynaLoader::dl_undef_symbols
-   77:	    if (@unresolved) {
-   82:	    $boot_symbol_ref = dl_find_symbol($libref, $bootname) or do {
-   entering DynaLoader::dl_find_symbol
-   87:	    push(@DynaLoader::dl_modules, $module); # record loaded module
-   89:	  boot:
-   90:	    my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
-   entering DynaLoader::dl_install_xsub
-   93:	    return &$xs(@_);
-   entering List::Util::bootstrap
-  26:	    1;
-  37:	if (!defined &reduce) {
-  75:	eval <<'ESQ' if !defined &sum;
-  101:	1;
-  15:	use List::Util  qw/first min max sum/;
-  15:	use List::Util  qw/first min max sum/;
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   47:	    s/^&//, $export_cache->{$_} = 1
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
- entering CODE(0x849af88)
-  16:	use Digest::HMAC_MD5 qw/hmac_md5_hex/; 
-  entering CODE(0x84ec01c)
-   4:	use strict;
-   4:	use strict;
-   4:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x84ec028)
-   5:	use Digest::MD5  qw(md5);
-   entering CODE(0x84ec214)
-    3:	use strict;
-    3:	use strict;
-    3:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x84ec220)
-    4:	use vars qw($VERSION @ISA @EXPORT_OK);
-    4:	use vars qw($VERSION @ISA @EXPORT_OK);
-    4:	use vars qw($VERSION @ISA @EXPORT_OK);
-    entering vars::import
-     11:	    my $callpack = caller;
-     12:	    my ($pack, @imports) = @_;
-     13:	    my ($sym, $ch);
-     14:	    foreach (@imports) {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-   Package /usr/lib/perl/5.8/Digest/MD5.pm.
-   6:	$VERSION = '2.36';  # $Date: 2005/11/30 13:46:47 $
-   8:	require Exporter;
-   9:	*import = \&Exporter::import;
-   10:	@EXPORT_OK = qw(md5 md5_hex md5_base64);
-   12:	eval {
-   13:	    require Digest::base;
-   entering CODE(0x84f6678)
-    3:	use strict;
-    3:	use strict;
-    3:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x84f6684)
-    4:	use vars qw($VERSION);
-    4:	use vars qw($VERSION);
-    4:	use vars qw($VERSION);
-    entering vars::import
-     11:	    my $callpack = caller;
-     12:	    my ($pack, @imports) = @_;
-     13:	    my ($sym, $ch);
-     14:	    foreach (@imports) {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-   Package /usr/share/perl/5.8/Digest/base.pm.
-   5:	$VERSION = "1.00";
-   67:	1;
-   14:	    push(@ISA, 'Digest::base');
-   16:	if ($@) {
-   22:	eval {
-   23:	    require XSLoader;
-   24:	    XSLoader::load('Digest::MD5', $VERSION);
-   entering XSLoader::load
-    25:	    die q{XSLoader::load('Your::Module', $Your::Module::VERSION)} unless @_;
-    27:	    my($module) = $_[0];
-    30:	    my $b = "$module\::bootstrap";
-    31:	    goto &$b if defined &$b;
-    33:	    goto retry unless $module and defined &dl_load_file;
-    35:	    my @modparts = split(/::/,$module);
-    36:	    my $modfname = $modparts[-1];
-    38:	    my $modpname = join('/',@modparts);
-    39:	    my $modlibname = (caller())[1];
-    40:	    my $c = @modparts;
-    41:	    $modlibname =~ s,[\\/][^\\/]+$,, while $c--;	# Q&D basename
-    42:	    my $file = "$modlibname/auto/$modpname/$modfname.$dl_dlext";
-    46:	    my $bs = $file;
-    47:	    $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; # look for .bs 'beside' the library
-    49:	    goto retry if not -f $file or -s $bs;
-    51:	    my $bootname = "boot_$module";
-    52:	    $bootname =~ s/\W/_/g;
-    53:	    @DynaLoader::dl_require_symbols = ($bootname);
-    55:	    my $boot_symbol_ref;
-    57:	    if ($^O eq 'darwin') {
-    70:	    my $libref = dl_load_file($file, 0) or do { 
-    entering DynaLoader::dl_load_file
-    74:	    push(@DynaLoader::dl_librefs,$libref);  # record loaded object
-    76:	    my @unresolved = dl_undef_symbols();
-    entering DynaLoader::dl_undef_symbols
-    77:	    if (@unresolved) {
-    82:	    $boot_symbol_ref = dl_find_symbol($libref, $bootname) or do {
-    entering DynaLoader::dl_find_symbol
-    87:	    push(@DynaLoader::dl_modules, $module); # record loaded module
-    89:	  boot:
-    90:	    my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
-    entering DynaLoader::dl_install_xsub
-    93:	    return &$xs(@_);
-    entering Digest::MD5::bootstrap
-   26:	if ($@) {
-   41:	    *reset = \&new;
-   44:	1;
-   45:	__END__
-   5:	use Digest::MD5  qw(md5);
-   5:	use Digest::MD5  qw(md5);
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-    48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-    47:	    s/^&//, $export_cache->{$_} = 1
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x84ec034)
-   6:	use Digest::HMAC qw(hmac);
-   entering CODE(0x84ec370)
-    4:	use strict;
-    4:	use strict;
-    4:	use strict;
-    entering strict::import
-     28:	    shift;
-     29:	    $^H |= @_ ? bits(@_) : $default_bits;
-   entering CODE(0x84ff604)
-    47:	use vars qw(@EXPORT_OK);
-    47:	use vars qw(@EXPORT_OK);
-    47:	use vars qw(@EXPORT_OK);
-    entering vars::import
-     11:	    my $callpack = caller;
-     12:	    my ($pack, @imports) = @_;
-     13:	    my ($sym, $ch);
-     14:	    foreach (@imports) {
-     15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-     16:		    if ($sym =~ /\W/) {
-     28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-     29:		    *$sym =
-     30:			(  $ch eq "\$" ? \$$sym
-     31:			 : $ch eq "\@" ? \@$sym
-     32:			 : $ch eq "\%" ? \%$sym
-     33:			 : $ch eq "\*" ? \*$sym
-     34:			 : $ch eq "\&" ? \&$sym 
-     35:			 : do {
-   Package /usr/share/perl5/Digest/HMAC.pm.
-   2:	$VERSION = "1.01";
-   45:	require Exporter;
-   46:	*import = \&Exporter::import;
-   48:	@EXPORT_OK = qw(hmac hmac_hex);
-   64:	1;
-   6:	use Digest::HMAC qw(hmac);
-   6:	use Digest::HMAC qw(hmac);
-   entering Exporter::import
-    30:	  my $pkg = shift;
-    31:	  my $callpkg = caller($ExportLevel);
-    33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-    40:	  return export $pkg, $callpkg, @_
-    41:	    if $Verbose or $Debug or @$fail > 1;
-    42:	  my $export_cache = ($Cache{$pkg} ||= {});
-    43:	  my $args = @_ or @_ = @$exports;
-    45:	  local $_;
-    46:	  if ($args and not %$export_cache) {
-    48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-    48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-    47:	    s/^&//, $export_cache->{$_} = 1
-    50:	  my $heavy;
-    53:	  if ($args or $fail) {
-    54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-    55:	               or @$fail and $_ eq $fail->[0])) and last
-    56:	                 foreach (@_);
-    56:	                 foreach (@_);
-    61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-    63:		sub {require Carp; &Carp::carp};
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-    65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-  entering CODE(0x84ec0b8)
-   9:	use vars qw(@ISA);
-   9:	use vars qw(@ISA);
-   9:	use vars qw(@ISA);
-   entering vars::import
-    11:	    my $callpack = caller;
-    12:	    my ($pack, @imports) = @_;
-    13:	    my ($sym, $ch);
-    14:	    foreach (@imports) {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-  entering CODE(0x84ffa60)
-   20:	use vars qw(@EXPORT_OK);
-   20:	use vars qw(@EXPORT_OK);
-   20:	use vars qw(@EXPORT_OK);
-   entering vars::import
-    11:	    my $callpack = caller;
-    12:	    my ($pack, @imports) = @_;
-    13:	    my ($sym, $ch);
-    14:	    foreach (@imports) {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-  Package /usr/share/perl5/Digest/HMAC_MD5.pm.
-  2:	$VERSION="1.01";
-  10:	@ISA=qw(Digest::HMAC);
-  11:	sub new
-  12:	{
-  18:	require Exporter;
-  19:	*import = \&Exporter::import;
-  21:	@EXPORT_OK=qw(hmac_md5 hmac_md5_hex);
-  33:	1;
-  16:	use Digest::HMAC_MD5 qw/hmac_md5_hex/; 
-  16:	use Digest::HMAC_MD5 qw/hmac_md5_hex/; 
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   48:	      foreach (@$exports, @{"$pkg\::EXPORT_OK"});
-   47:	    s/^&//, $export_cache->{$_} = 1
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
- entering CODE(0x84dbb60)
-  17:	use MIME::Base64;
-  entering CODE(0x84ffd60)
-   5:	use strict;
-   5:	use strict;
-   5:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x84ffd6c)
-   6:	use vars qw(@ISA @EXPORT $VERSION);
-   6:	use vars qw(@ISA @EXPORT $VERSION);
-   6:	use vars qw(@ISA @EXPORT $VERSION);
-   entering vars::import
-    11:	    my $callpack = caller;
-    12:	    my ($pack, @imports) = @_;
-    13:	    my ($sym, $ch);
-    14:	    foreach (@imports) {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-    15:	        if (($ch, $sym) = /^([\$\@\%\*\&])(.+)/) {
-    16:		    if ($sym =~ /\W/) {
-    28:		    $sym = "${callpack}::$sym" unless $sym =~ /::/;
-    29:		    *$sym =
-    30:			(  $ch eq "\$" ? \$$sym
-    31:			 : $ch eq "\@" ? \@$sym
-    32:			 : $ch eq "\%" ? \%$sym
-    33:			 : $ch eq "\*" ? \*$sym
-    34:			 : $ch eq "\&" ? \&$sym 
-    35:			 : do {
-  Package /usr/lib/perl/5.8/MIME/Base64.pm.
-  8:	require Exporter;
-  9:	@ISA = qw(Exporter);
-  10:	@EXPORT = qw(encode_base64 decode_base64);
-  12:	$VERSION = '3.07';
-  14:	require XSLoader;
-  15:	XSLoader::load('MIME::Base64', $VERSION);
-  entering XSLoader::load
-   25:	    die q{XSLoader::load('Your::Module', $Your::Module::VERSION)} unless @_;
-   27:	    my($module) = $_[0];
-   30:	    my $b = "$module\::bootstrap";
-   31:	    goto &$b if defined &$b;
-   33:	    goto retry unless $module and defined &dl_load_file;
-   35:	    my @modparts = split(/::/,$module);
-   36:	    my $modfname = $modparts[-1];
-   38:	    my $modpname = join('/',@modparts);
-   39:	    my $modlibname = (caller())[1];
-   40:	    my $c = @modparts;
-   41:	    $modlibname =~ s,[\\/][^\\/]+$,, while $c--;	# Q&D basename
-   42:	    my $file = "$modlibname/auto/$modpname/$modfname.$dl_dlext";
-   46:	    my $bs = $file;
-   47:	    $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/; # look for .bs 'beside' the library
-   49:	    goto retry if not -f $file or -s $bs;
-   51:	    my $bootname = "boot_$module";
-   52:	    $bootname =~ s/\W/_/g;
-   53:	    @DynaLoader::dl_require_symbols = ($bootname);
-   55:	    my $boot_symbol_ref;
-   57:	    if ($^O eq 'darwin') {
-   70:	    my $libref = dl_load_file($file, 0) or do { 
-   entering DynaLoader::dl_load_file
-   74:	    push(@DynaLoader::dl_librefs,$libref);  # record loaded object
-   76:	    my @unresolved = dl_undef_symbols();
-   entering DynaLoader::dl_undef_symbols
-   77:	    if (@unresolved) {
-   82:	    $boot_symbol_ref = dl_find_symbol($libref, $bootname) or do {
-   entering DynaLoader::dl_find_symbol
-   87:	    push(@DynaLoader::dl_modules, $module); # record loaded module
-   89:	  boot:
-   90:	    my $xs = dl_install_xsub("${module}::bootstrap", $boot_symbol_ref, $file);
-   entering DynaLoader::dl_install_xsub
-   93:	    return &$xs(@_);
-   entering MIME::Base64::bootstrap
-  17:	*encode = \&encode_base64;
-  18:	*decode = \&decode_base64;
-  20:	1;
-  17:	use MIME::Base64;
-  17:	use MIME::Base64;
-  entering Exporter::import
-   30:	  my $pkg = shift;
-   31:	  my $callpkg = caller($ExportLevel);
-   33:	  if ($pkg eq "Exporter" and @_ and $_[0] eq "import") {
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   39:	  my($exports, $fail) = (\@{"$pkg\::EXPORT"}, \@{"$pkg\::EXPORT_FAIL"});
-   40:	  return export $pkg, $callpkg, @_
-   41:	    if $Verbose or $Debug or @$fail > 1;
-   42:	  my $export_cache = ($Cache{$pkg} ||= {});
-   43:	  my $args = @_ or @_ = @$exports;
-   45:	  local $_;
-   46:	  if ($args and not %$export_cache) {
-   50:	  my $heavy;
-   53:	  if ($args or $fail) {
-   54:	    ($heavy = (/\W/ or $args and not exists $export_cache->{$_}
-   55:	               or @$fail and $_ eq $fail->[0])) and last
-   56:	                 foreach (@_);
-   56:	                 foreach (@_);
-   61:	  return export $pkg, $callpkg, ($args ? @_ : ()) if $heavy;
-   63:		sub {require Carp; &Carp::carp};
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
-   65:	  *{"$callpkg\::$_"} = \&{"$pkg\::$_"} foreach @_;
- entering CODE(0x84e49c8)
-  19:	use constant Unconnected   => 0;
-  entering CODE(0x85074c4)
-   3:	use strict;
-   3:	use strict;
-   3:	use strict;
-   entering strict::import
-    28:	    shift;
-    29:	    $^H |= @_ ? bits(@_) : $default_bits;
-  entering CODE(0x85074d0)
-   4:	use 5.006_00;
-   4:	use 5.006_00;
-   4:	use 5.006_00;
-  entering CODE(0x85074dc)
-   5:	use warnings::register;
-   5:	use warnings::register;
-   5:	use warnings::register;
-   entering warnings::register::import
-    18:	    shift;
-    19:	    my $package = (caller(0))[0];
-    20:	    if (! defined $warnings::Bits{$package}) {
-    21:	        $warnings::Bits{$package}     = mkMask($warnings::LAST_BIT);
-    entering warnings::register::mkMask
-     9:	    my ($bit) = @_;
-     10:	    my $mask = "";
-     12:	    vec($mask, $bit, 1) = 1;
-     13:	    return $mask;
-    22:	        vec($warnings::Bits{'all'}, $warnings::LAST_BIT, 1) = 1;
-    23:	        $warnings::Offsets{$package}  = $warnings::LAST_BIT ++;
-    24:		foreach my $k (keys %warnings::Bits) {
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    25:		    vec($warnings::Bits{$k}, $warnings::LAST_BIT, 1) = 0;
-    27:	        $warnings::DeadBits{$package} = mkMask($warnings::LAST_BIT);
-    entering warnings::register::mkMask
-     9:	    my ($bit) = @_;
-     10:	    my $mask = "";
-     12:	    vec($mask, $bit, 1) = 1;
-     13:	    return $mask;
-    28:	        vec($warnings::DeadBits{'all'}, $warnings::LAST_BIT++, 1) = 1;
-  entering CODE(0x850807c)
-   94:		    no strict 'refs';
-   94:		    no strict 'refs';
-   94:		    no strict 'refs';
-   entering strict::unimport
-    33:	    shift;
-    34:	    $^H &= ~ (@_ ? bits(@_) : $default_bits);
-    entering strict::bits
-     12:	    my $bits = 0;
-     13:	    my @wrong;
-     14:	    foreach my $s (@_) {
-     15:		push @wrong, $s unless exists $bitmask{$s};
-     16:	        $bits |= $bitmask{$s} || 0;
-     18:	    if (@wrong) {
-     22:	    $bits;
-  Package /usr/share/perl/5.8/constant.pm.
-  7:	our($VERSION, %declared);
-  8:	$VERSION = '1.05';
-  13:	my %keywords = map +($_, 1), qw{ BEGIN INIT CHECK END DESTROY AUTOLOAD };
-  15:	my %forced_into_main = map +($_, 1),
-  16:	    qw{ STDIN STDOUT STDERR ARGV ARGVOUT ENV INC SIG };
-  18:	my %forbidden = (%keywords, %forced_into_main);
-  115:	1;
-  19:	use constant Unconnected   => 0;
-  19:	use constant Unconnected   => 0;
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x84dbb84)
-  20:	use constant Connected     => 1; # connected; not logged in
-  20:	use constant Connected     => 1; # connected; not logged in
-  20:	use constant Connected     => 1; # connected; not logged in
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x84e4998)
-  21:	use constant Authenticated => 2; # logged in; no mailbox selected
-  21:	use constant Authenticated => 2; # logged in; no mailbox selected
-  21:	use constant Authenticated => 2; # logged in; no mailbox selected
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x84a6b7c)
-  22:	use constant Selected      => 3; # mailbox selected
-  22:	use constant Selected      => 3; # mailbox selected
-  22:	use constant Selected      => 3; # mailbox selected
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x8507770)
-  24:	use constant INDEX         => 0; # Array index for output line number
-  24:	use constant INDEX         => 0; # Array index for output line number
-  24:	use constant INDEX         => 0; # Array index for output line number
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x8507698)
-  25:	use constant TYPE          => 1; # Array index for line type
-  25:	use constant TYPE          => 1; # Array index for line type
-  25:	use constant TYPE          => 1; # Array index for line type
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x84e948c)
-  27:	use constant DATA          => 2; # Array index for output line data
-  27:	use constant DATA          => 2; # Array index for output line data
-  27:	use constant DATA          => 2; # Array index for output line data
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x8510768)
-  29:	use constant NonFolderArg => 1;  # Value to pass to Massage to
-  29:	use constant NonFolderArg => 1;  # Value to pass to Massage to
-  29:	use constant NonFolderArg => 1;  # Value to pass to Massage to
-  entering constant::import
-   29:	    my $class = shift;
-   30:	    return unless @_;			# Ignore 'use constant;'
-   31:	    my %constants = ();
-   32:	    my $multiple  = ref $_[0];
-   34:	    if ( $multiple ) {
-   41:		$constants{+shift} = undef;
-   44:	    foreach my $name ( keys %constants ) {
-   45:		unless (defined $name) {
-   49:		my $pkg = caller;
-   52:		if ($name =~ /^_?[^\W_0-9]\w*\z/ and !$forbidden{$name}) {
-   94:		    no strict 'refs';
-   95:		    my $full_name = "${pkg}::$name";
-   96:		    $declared{$full_name}++;
-   97:		    if ($multiple) {
-   101:			if (@_ == 1) {
-   102:			    my $scalar = $_[0];
-   103:			    *$full_name = sub () { $scalar };
- entering CODE(0x8510d2c)
-  54:	   { no strict 'refs';
-  54:	   { no strict 'refs';
-  54:	   { no strict 'refs';
-  entering strict::unimport
-   33:	    shift;
-   34:	    $^H &= ~ (@_ ? bits(@_) : $default_bits);
-   entering strict::bits
-    12:	    my $bits = 0;
-    13:	    my @wrong;
-    14:	    foreach my $s (@_) {
-    15:		push @wrong, $s unless exists $bitmask{$s};
-    16:	        $bits |= $bitmask{$s} || 0;
-    18:	    if (@wrong) {
-    22:	    $bits;
- entering CODE(0x8510b4c)
-  48:	   foreach my $datum (
-  49:	     qw(State Port Server Folder Peek User Password Timeout Buffer
-  50:	        Debug Count Uid Debug_fh Maxtemperrors
-  51:	        EnableServerResponseInLiteral Authmechanism Authcallback Ranges
-  52:	        Readmethod Showcredentials Prewritemethod Ignoresizeerrors
-  53:	        Supportedflags Proxy))
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- entering CODE(0x85ab5dc)
-  1324:	        no warnings;
-  1324:	        no warnings;
-  1324:	        no warnings;
-  entering warnings::unimport
-   251:	    shift;
-   253:	    my $catmask ;
-   254:	    my $mask = ${^WARNING_BITS} ;
-   256:	    if (vec($mask, $Offsets{'all'}, 1)) {
-   257:	        $mask |= $Bits{'all'} ;
-   258:	        $mask |= $DeadBits{'all'} if vec($mask, $Offsets{'all'}+1, 1);
-   261:	    push @_, 'all' unless @_;
-   263:	    foreach my $word ( @_ ) {
-   264:		if ($word eq 'FATAL') {
-   268:		    $mask &= ~($catmask | $DeadBits{$word} | $All);
-   274:	    ${^WARNING_BITS} = $mask ;
- Package Mail-IMAPClient-2.99_02/lib/Mail/IMAPClient.pm.
- 3:	our $VERSION = '2.99_02';
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 32:	my %SEARCH_KEYS = map { ( $_ => 1 ) } qw/
- 33:	    ALL ANSWERED BCC BEFORE BODY CC DELETED DRAFT FLAGGED
- 34:	    FROM HEADER KEYWORD LARGER NEW NOT OLD ON OR RECENT
- 35:	    SEEN SENTBEFORE SENTON SENTSINCE SINCE SMALLER SUBJECT
- 36:	    TEXT TO UID UNANSWERED UNDELETED UNDRAFT UNFLAGGED
- 37:	    UNKEYWORD UNSEEN/;
- 110:	my @dow  = qw/Sun Mon Tue Wed Thu Fri Sat/;
- 111:	my @mnt  = qw/Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec/;
- 2129:	my $thread_parser;
- 2130:	sub thread
- 2856:	1;
- 4:	use Mail::IMAPClient;
- 4:	use Mail::IMAPClient;
-Package t/01_connect.
-6:	$imap = Mail::IMAPClient->new(Debug => 1);
-entering Mail::IMAPClient::new
- 171:	{   my $class = shift;
- 172:	    my $self  =
- 173:	      { LastError     => "",
- 174:	      , Uid           => 1
- 175:	      , Count         => 0
- 176:	      , Fast_io       => 1
- 177:	      , Clear         => 5
- 178:	      , Maxtemperrors => 'unlimited'
- 179:	      , State         => Unconnected
- 181:	    while(@_)
- 182:	    {   my $k = ucfirst lc shift;
- 183:	        $self->{$k} = shift;
- 185:	    bless $self, ref($class)||$class;
- 187:	    if($self->{Supportedflags})  # unpack into case-less HASH
- 192:	    $self->{Debug_fh} ||= \*STDERR;
- 193:	    select((select($self->{Debug_fh}),$|++)[0]);
- 195:	    $self->_debug("Using Mail::IMAPClient version $Mail::IMAPClient::VERSION " .
- 196:	        "and perl version " . (defined $^V ? join(".",unpack("CCC",$^V)) : "") .
- 197:	        " ($])\n") if $self->Debug;
- entering CODE(0x8511284)
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- entering Mail::IMAPClient::_debug
-  40:	{   my $self = shift;
-  41:	    return unless $self->Debug;
-  entering CODE(0x8511284)
-   55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  42:	    my $fh   = $self->{Debug_fh} || \*STDERR;
-  43:	    print $fh @_;
- 199:	    if($self->{Socket})    { $self->Socket($self->{Socket}) }
- 202:	    $self;
-7:	$imap->Debug(1);
-entering CODE(0x8511284)
- 55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-8:	$imap->Server('louloutte.dyndns.org');
-entering CODE(0x8510f3c)
- 55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-9:	$imap->connect() or croak "Error connecting @!";
-entering Mail::IMAPClient::connect
- 206:	{   my $self = shift;
- 207:	    %$self = (%$self, @_);
- 209:	    my $sock = IO::Socket::INET->new
- 210:	      ( PeerAddr => $self->Server
- 211:	      , PeerPort => ( $self->Port   || 'imap(143)')
- 212:	      , Timeout  => ($self->Timeout || 0)
- 213:	      , Proto    => 'tcp'
- 214:	      , Debug    => $self->Debug
- 215:	      );
- entering CODE(0x8510f3c)
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- entering CODE(0x8510ec4)
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- entering CODE(0x8511194)
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- entering CODE(0x8511284)
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- entering IO::Socket::INET::new
-  30:	    my $class = shift;
-  31:	    unshift(@_, "PeerAddr") if @_ == 1;
-  32:	    return $class->SUPER::new(@_);
-  entering IO::Socket::new
-   41:	    my($class,%arg) = @_;
-   42:	    my $sock = $class->SUPER::new();
-   entering IO::Handle::new
-    53:	    my $class = ref($_[0]) || $_[0] || "IO::Handle";
-    54:	    @_ == 1 or croak "usage: new $class";
-    55:	    my $io = gensym;
-    entering Symbol::gensym
-     23:	    my $name = "GEN" . $genseq++;
-     24:	    my $ref = \*{$genpkg . $name};
-     24:	    my $ref = \*{$genpkg . $name};
-     25:	    delete $$genpkg{$name};
-     26:	    $ref;
-    56:	    bless $io, $class;
-   44:	    $sock->autoflush(1);
-   entering IO::Handle::autoflush
-    213:	    my $old = new SelectSaver qualify($_[0], caller);
-    entering Symbol::qualify
-     39:	    my ($name) = @_;
-     40:	    if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-     53:	    $name;
-    entering SelectSaver::new
-     10:	    @_ >= 1 && @_ <= 2 or croak 'usage: new SelectSaver [FILEHANDLE]';
-     11:	    my $fh = select;
-     12:	    my $self = bless \$fh, $_[0];
-     13:	    select qualify($_[1], caller) if @_ > 1;
-     entering Symbol::qualify
-      39:	    my ($name) = @_;
-      40:	    if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-      53:	    $name;
-     14:	    $self;
-    214:	    my $prev = $|;
-    215:	    $| = @_ > 1 ? $_[1] : 1;
-    216:	    $prev;
-    entering SelectSaver::DESTROY
-     18:	    my $self = $_[0];
-     19:	    select $$self;
-   46:	    ${*$sock}{'io_socket_timeout'} = delete $arg{Timeout};
-   46:	    ${*$sock}{'io_socket_timeout'} = delete $arg{Timeout};
-   48:	    return scalar(%arg) ? $sock->configure(\%arg)
-   49:				: $sock;
-   entering IO::Socket::INET::configure
-    104:	    my($sock,$arg) = @_;
-    105:	    my($lport,$rport,$laddr,$raddr,$proto,$type);
-    107:	    $arg->{LocalAddr} = $arg->{LocalHost}
-    108:		if exists $arg->{LocalHost} && !exists $arg->{LocalAddr};
-    110:	    ($laddr,$lport,$proto) = _sock_info($arg->{LocalAddr},
-    111:						$arg->{LocalPort},
-    112:						$arg->{Proto})
-    113:				or return _error($sock, $!, $@);
-    entering IO::Socket::INET::_sock_info
-     36:	  my($addr,$port,$proto) = @_;
-     37:	  my $origport = $port;
-     38:	  my @proto = ();
-     39:	  my @serv = ();
-     41:	  $port = $1
-     42:		if(defined $addr && $addr =~ s,:([\w\(\)/]+)$,,);
-     44:	  if(defined $proto  && $proto =~ /\D/) {
-     45:	    if(@proto = getprotobyname($proto)) {
-     46:	      $proto = $proto[2] || undef;
-     54:	  if(defined $port) {
-     71:	 return ($addr || undef,
-     72:		 $port || undef,
-     73:		 $proto || undef
-     74:		);
-    115:	    $laddr = defined $laddr ? inet_aton($laddr)
-    116:				    : INADDR_ANY;
-    entering Socket::AUTOLOAD for Socket::INADDR_ANY
-     216:	    my($constname);
-     217:	    ($constname = $AUTOLOAD) =~ s/.*:://;
-     218:	    croak "&Socket::constant not defined" if $constname eq 'constant';
-     219:	    my ($error, $val) = constant($constname);
-     entering Socket::constant
-     220:	    if ($error) {
-     223:	    *$AUTOLOAD = sub { $val };
-     224:	    goto &$AUTOLOAD;
-     223:	    *$AUTOLOAD = sub { $val };
-    118:	    return _error($sock, $EINVAL, "Bad hostname '",$arg->{LocalAddr},"'")
-    119:		unless(defined $laddr);
-    121:	    $arg->{PeerAddr} = $arg->{PeerHost}
-    122:		if exists $arg->{PeerHost} && !exists $arg->{PeerAddr};
-    124:	    unless(exists $arg->{Listen}) {
-    125:		($raddr,$rport,$proto) = _sock_info($arg->{PeerAddr},
-    126:						    $arg->{PeerPort},
-    127:						    $proto)
-    128:				or return _error($sock, $!, $@);
-    entering IO::Socket::INET::_sock_info
-     36:	  my($addr,$port,$proto) = @_;
-     37:	  my $origport = $port;
-     38:	  my @proto = ();
-     39:	  my @serv = ();
-     41:	  $port = $1
-     42:		if(defined $addr && $addr =~ s,:([\w\(\)/]+)$,,);
-     44:	  if(defined $proto  && $proto =~ /\D/) {
-     54:	  if(defined $port) {
-     55:	    my $defport = ($port =~ s,\((\d+)\)$,,) ? $1 : undef;
-     56:	    my $pnum = ($port =~ m,^(\d+)$,)[0];
-     58:	    @serv = getservbyname($port, $proto[0] || "")
-     59:		if ($port =~ m,\D,);
-     61:	    $port = $serv[2] || $defport || $pnum;
-     62:	    unless (defined $port) {
-     67:	    $proto = (getprotobyname($serv[3]))[2] || undef
-     68:		if @serv && !$proto;
-     71:	 return ($addr || undef,
-     72:		 $port || undef,
-     73:		 $proto || undef
-     74:		);
-    131:	    $proto ||= (getprotobyname('tcp'))[2];
-    133:	    my $pname = (getprotobynumber($proto))[0];
-    134:	    $type = $arg->{Type} || $socket_type{lc $pname};
-    136:	    my @raddr = ();
-    138:	    if(defined $raddr) {
-    139:		@raddr = $sock->_get_addr($raddr, $arg->{MultiHomed});
-    entering IO::Socket::INET::_get_addr
-     92:	    my($sock,$addr_str, $multi) = @_;
-     93:	    my @addr;
-     94:	    if ($multi && $addr_str !~ /^\d+(?:\.\d+){3}$/) {
-     97:		my $h = inet_aton($addr_str);
-     entering Socket::inet_aton
-     98:		push(@addr, $h) if defined $h;
-     100:	    @addr;
-    140:		return _error($sock, $EINVAL, "Bad hostname '",$arg->{PeerAddr},"'")
-    141:		    unless @raddr;
-    144:	    while(1) {
-    146:		$sock->socket(AF_INET, $type, $proto) or
-    147:		    return _error($sock, $!, "$!");
-    entering CODE(0x846272c)
-     223:	    *$AUTOLOAD = sub { $val };
-    entering IO::Socket::socket
-     77:	    @_ == 4 or croak 'usage: $sock->socket(DOMAIN, TYPE, PROTOCOL)';
-     78:	    my($sock,$domain,$type,$protocol) = @_;
-     80:	    socket($sock,$domain,$type,$protocol) or
-     81:	    	return undef;
-     83:	    ${*$sock}{'io_socket_domain'} = $domain;
-     83:	    ${*$sock}{'io_socket_domain'} = $domain;
-     84:	    ${*$sock}{'io_socket_type'}   = $type;
-     84:	    ${*$sock}{'io_socket_type'}   = $type;
-     85:	    ${*$sock}{'io_socket_proto'}  = $protocol;
-     85:	    ${*$sock}{'io_socket_proto'}  = $protocol;
-     87:	    $sock;
-    149:	        if (defined $arg->{Blocking}) {
-    154:		if ($arg->{Reuse} || $arg->{ReuseAddr}) {
-    159:		if ($arg->{ReusePort}) {
-    164:		if ($arg->{Broadcast}) {
-    169:		if($lport || ($laddr ne INADDR_ANY) || exists $arg->{Listen}) {
-    entering CODE(0x8571688)
-     223:	    *$AUTOLOAD = sub { $val };
-    174:		if(exists $arg->{Listen}) {
-    181:	 	last unless exists($arg->{PeerAddr});
-    183:	        $raddr = shift @raddr;
-    185:		return _error($sock, $EINVAL, 'Cannot determine remote port')
-    186:			unless($rport || $type == SOCK_DGRAM || $type == SOCK_RAW);
-    189:		    unless($type == SOCK_STREAM || defined $raddr);
-    entering CODE(0x84781ac)
-     223:	    *$AUTOLOAD = sub { $val };
-    191:		return _error($sock, $EINVAL, "Bad hostname '",$arg->{PeerAddr},"'")
-    192:		    unless defined $raddr;
-    197:		undef $@;
-    198:	        if ($sock->connect(pack_sockaddr_in($rport, $raddr))) {
-    entering Socket::pack_sockaddr_in
-    entering IO::Socket::INET::connect
-     220:	    @_ == 2 || @_ == 3 or
-     221:	       croak 'usage: $sock->connect(NAME) or $sock->connect(PORT, ADDR)';
-     222:	    my $sock = shift;
-     223:	    return $sock->SUPER::connect(@_ == 1 ? shift : pack_sockaddr_in(@_));
-     entering IO::Socket::connect
-      106:	    @_ == 2 or croak 'usage: $sock->connect(NAME)';
-      107:	    my $sock = shift;
-      108:	    my $addr = shift;
-      109:	    my $timeout = ${*$sock}{'io_socket_timeout'};
-      109:	    my $timeout = ${*$sock}{'io_socket_timeout'};
-      110:	    my $err;
-      111:	    my $blocking;
-      113:	    $blocking = $sock->blocking(0) if $timeout;
-      114:	    if (!connect($sock, $addr)) {
-      137:	    $sock->blocking(1) if $blocking;
-      139:	    $! = $err if $err;
-      141:	    $err ? undef : $sock;
-    200:	            return $sock;
- 217:	    unless($sock)
- 222:	    $self->Socket($sock);
- entering Mail::IMAPClient::Socket
-  97:	{   my ($self, $sock) = @_;
-  98:	    defined $sock
-  99:	       or return $self->{Socket};
-  101:	    delete $self->{_fcntl};
-  103:	    $self->{_select} = IO::Select->new($_[1]);
-  entering IO::Select::new
-   24:	 my $self = shift;
-   25:	 my $type = ref($self) || $self;
-   27:	 my $vec = bless [undef,0], $type;
-   29:	 $vec->add(@_)
-   30:	    if @_;
-   entering IO::Select::add
-    37:	 shift->_update('add', @_);
-    entering IO::Select::_update
-     63:	 my $vec = shift;
-     64:	 my $add = shift eq 'add';
-     66:	 my $bits = $vec->[VEC_BITS];
-     67:	 $bits = '' unless defined $bits;
-     69:	 my $count = 0;
-     70:	 my $f;
-     71:	 foreach $f (@_)
-     72:	  {
-     73:	   my $fn = $vec->_fileno($f);
-     entering IO::Select::_fileno
-      55:	 my($self, $f) = @_;
-      56:	 return unless defined $f;
-      57:	 $f = $f->[0] if ref($f) eq 'ARRAY';
-      58:	 ($f =~ /^\d+$/) ? $f : fileno($f);
-     74:	   next unless defined $fn;
-     75:	   my $i = $fn + FIRST_FD;
-     76:	   if ($add) {
-     77:	     if (defined $vec->[$i]) {
-     81:	     $vec->[FD_COUNT]++;
-     82:	     vec($bits, $fn, 1) = 1;
-     83:	     $vec->[$i] = $f;
-     90:	   $count++;
-     92:	 $vec->[VEC_BITS] = $vec->[FD_COUNT] ? $bits : undef;
-     93:	 $count;
-   32:	 $vec;
- 223:	    $self->State(Connected);
- entering CODE(0x8510dc8)
-  55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
- 224:	    $sock->autoflush(1);
- entering IO::Handle::autoflush
-  213:	    my $old = new SelectSaver qualify($_[0], caller);
-  entering Symbol::qualify
-   39:	    my ($name) = @_;
-   40:	    if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-   53:	    $name;
-  entering SelectSaver::new
-   10:	    @_ >= 1 && @_ <= 2 or croak 'usage: new SelectSaver [FILEHANDLE]';
-   11:	    my $fh = select;
-   12:	    my $self = bless \$fh, $_[0];
-   13:	    select qualify($_[1], caller) if @_ > 1;
-   entering Symbol::qualify
-    39:	    my ($name) = @_;
-    40:	    if (!ref($name) && index($name, '::') == -1 && index($name, "'") == -1) {
-    53:	    $name;
-   14:	    $self;
-  214:	    my $prev = $|;
-  215:	    $| = @_ > 1 ? $_[1] : 1;
-  216:	    $prev;
-  entering SelectSaver::DESTROY
-   18:	    my $self = $_[0];
-   19:	    select $$self;
- 226:	    my $code;
- 227:	  LINE:
- 228:	    while(my $output = $self->_read_line)
- entering Mail::IMAPClient::_read_line
-  1274:	{   my ($self, $literal_callback, $output_callback) = @_;
-  1276:	    my $sh = $self->Socket;
-  entering Mail::IMAPClient::Socket
-   97:	{   my ($self, $sock) = @_;
-   98:	    defined $sock
-   99:	       or return $self->{Socket};
-  1277:	    unless($self->IsConnected && $self->Socket)
-  entering Mail::IMAPClient::IsConnected
-   2816:	sub IsConnected     { shift->State >= Connected }
-   entering CODE(0x8510dc8)
-    55:	     *$datum = sub { @_ > 1 ? $_[0]->{$datum} = $_[1] : $_[0]->{$datum} };
-  entering Mail::IMAPClient::Socket
-   97:	{   my ($self, $sock) = @_;
-   98:	    defined $sock
-   99:	       or return $self->{Socket};
-  1278:	    {   $self->LastError("NO Not connected.");
-  entering Mail::IMAPClient::LastError
-   60:	{   my $self = shift;
-   61:	    $self->{LastError} = shift if @_;
-   62:	    $@ = $self->{LastError};
-  1279:	        return undef;
- 238:	    $code or return undef;
-entering Carp::croak
- 102:	sub croak   { die  shortmess @_ }
- entering Carp::shortmess
-  86:		local($@, $!);
-  86:		local($@, $!);
-  89:		require Carp::Heavy unless $INC{"Carp/Heavy.pm"};
-  92:	    my $call_pack = caller();
-  93:	    local @CARP_NOT = caller();
-  94:	    shortmess_heavy(@_);
-  entering Carp::shortmess_heavy
-   177:	  return longmess_heavy(@_) if $Verbose;
-   178:	  return @_ if ref($_[0]); # don't break references as exceptions
-   179:	  my $i = short_error_loc();
-   entering Carp::short_error_loc
-    160:	  my $cache;
-    161:	  my $i = 1;
-    162:	  my $lvl = $CarpLevel;
-    163:	  {
-    164:	    my $called = caller($i++);
-    164:	    my $called = caller($i++);
-    165:	    my $caller = caller($i);
-    166:	    return 0 unless defined($caller); # What happened?
-    167:	    redo if $Internal{$caller};
-    168:	    redo if $CarpInternal{$called};
-    164:	    my $called = caller($i++);
-    165:	    my $caller = caller($i);
-    166:	    return 0 unless defined($caller); # What happened?
-    167:	    redo if $Internal{$caller};
-    168:	    redo if $CarpInternal{$called};
-    164:	    my $called = caller($i++);
-    165:	    my $caller = caller($i);
-    166:	    return 0 unless defined($caller); # What happened?
-   180:	  if ($i) {
-   184:	    longmess_heavy(@_);
-   entering Carp::longmess_heavy
-    115:	  return @_ if ref($_[0]); # don't break references as exceptions
-    116:	  my $i = long_error_loc();
-    entering Carp::long_error_loc
-     91:	  my $i;
-     92:	  my $lvl = $CarpLevel;
-     93:	  {
-     94:	    my $pkg = caller(++$i);
-     94:	    my $pkg = caller(++$i);
-     95:	    unless(defined($pkg)) {
-     107:	    redo if $CarpInternal{$pkg};
-     94:	    my $pkg = caller(++$i);
-     95:	    unless(defined($pkg)) {
-     107:	    redo if $CarpInternal{$pkg};
-     94:	    my $pkg = caller(++$i);
-     95:	    unless(defined($pkg)) {
-     107:	    redo if $CarpInternal{$pkg};
-     94:	    my $pkg = caller(++$i);
-     95:	    unless(defined($pkg)) {
-     107:	    redo if $CarpInternal{$pkg};
-     108:	    redo unless 0 > --$lvl;
-     109:	    redo if $Internal{$pkg};
-     111:	  return $i - 1;
-    117:	  return ret_backtrace($i, @_);
-    entering Carp::ret_backtrace
-     123:	  my ($i, @error) = @_;
-     124:	  my $mess;
-     125:	  my $err = join '', @error;
-     126:	  $i++;
-     128:	  my $tid_msg = '';
-     129:	  if (defined &Thread::tid) {
-     134:	  my %i = caller_info($i);
-     entering Carp::caller_info
-      12:	  my $i = shift(@_) + 1;
-      13:	  package DB;
-      14:	
-      15:	
-      16:	
-      17:	
-      18:	
-      19:	
-      20:	
-      21:	
-      22:	
-      23:	
-      24:	
-      25:	
-      26:	
-      27:	
-      28:	
-      29:	
-      30:	
-      31:	
-      32:	
-      33:	
-      34:	
-      35:	
-      73:	  my $info = shift;
-      74:	  if (defined($info->{evaltext})) {
-      85:	  return ($info->{sub} eq '(eval)') ? 'eval {...}' : $info->{sub};
-      39:	  my $arg = shift;
-      40:	  if (ref($arg)) {
-      45:	  $arg =~ s/'/\\'/g;
-      46:	  $arg = str_len_trim($arg, $MaxArgLen);
-      entering Carp::str_len_trim
-       190:	  my $str = shift;
-       191:	  my $max = shift || 0;
-       192:	  if (2 < $max and $max < length($str)) {
-       195:	  return $str;
-      49:	  $arg = "'$arg'" unless $arg =~ /^-?[\d.]+\z/;
-      55:	    or $arg =~ s/([[:cntrl:]]|[[:^ascii:]])/sprintf("\\x{%x}",ord($1))/eg;
-      entering utf8::is_utf8
-      56:	  return $arg;
-     135:	  $mess = "$err at $i{file} line $i{line}$tid_msg\n";
-     137:	  while (my %i = caller_info(++$i)) {
-     entering Carp::caller_info
-      12:	  my $i = shift(@_) + 1;
-      13:	  package DB;
-      14:	
-      15:	
-      16:	
-      17:	
-      18:	
-      19:	
-      20:	
-      21:	
-      22:	
-      23:	
-      24:	
-      25:	
-      26:	
-      27:	
-      28:	
-      29:	
-      30:	
-      31:	
-      32:	
-      33:	
-      34:	
-      35:	
-     141:	  return $mess;
-entering IO::Handle::DESTROY
- 75:	sub DESTROY {}
-entering IO::Handle::DESTROY
- 75:	sub DESTROY {}
-entering Config::DESTROY
- 62:	sub DESTROY { }
-entering IO::Handle::DESTROY
- 75:	sub DESTROY {}
diff --git a/t/02_append_string b/t/02_append_string
new file mode 100755
index 0000000..d470fe9
--- /dev/null
+++ b/t/02_append_string
@@ -0,0 +1,35 @@
+#!/usr/bin/perl -w
+
+use Carp;
+use Mail::IMAPClient;
+
+$imap = Mail::IMAPClient->new();
+$imap->Debug(0);
+$imap->Server('louloutte.dyndns.org');
+$imap->connect() or croak "Error connecting $@ !";
+$imap->User('MarkOv@est.belle');
+$imap->Password('emhj91ly');
+$imap->login() or croak "Error login $@ !";
+
+$imap->Uid(1) or croak "Error Uid $@ !";
+
+print "[", $imap->folders, "]\n";
+
+$imap->select('Inbox') or croak "Could not select: $@ !";
+my @messages = $imap->messages or croak "Could not get message list: $@ !";
+print "[@messages]\n";
+$message = $messages[1];
+print "[$message]\n";
+my $string = $imap->message_string($message);
+print $string;
+
+#my $uid = $imap->append_string('INBOX.Trash', $string, '\Seen', "30-Oct-2006 01:34:14 +0100")
+#          or croak "Could not append_string: $@\n";
+my $uid = $imap->append_string('INBOX.Trash', "$string", '\Seen', "")
+          or croak "Could not append_string: $@\n";
+
+print "$uid\n";
+
+$imap->logout();
+
+
diff --git a/t/03_message_to_file b/t/03_message_to_file
new file mode 100755
index 0000000..7be09bf
--- /dev/null
+++ b/t/03_message_to_file
@@ -0,0 +1,53 @@
+#!/usr/bin/perl -w
+
+use Carp;
+use Mail::IMAPClient;
+use strict;
+
+my $imap1 = Mail::IMAPClient->new();
+$imap1->Debug(0);
+$imap1->Server('louloutte.dyndns.org');
+$imap1->connect() or croak "Error connecting $@ !";
+$imap1->User('MarkOv@est.belle');
+$imap1->Password('emhj91ly');
+$imap1->login() or croak "Error login $@ !";
+$imap1->Uid(1) or croak "Error Uid $@ !";
+
+my $imap2 = Mail::IMAPClient->new();
+$imap2->Debug(0);
+$imap2->Server('louloutte.dyndns.org');
+$imap2->connect() or croak "Error connecting $@ !";
+$imap2->User('MarkOv@est.belle');
+$imap2->User('titi@est.belle');
+$imap2->Password('HUwtEd');
+$imap2->login() or croak "Error login $@ !";
+$imap2->Uid(1) or croak "Error Uid $@ !";
+
+
+
+print "[", $imap1->folders, "]\n";
+
+$imap1->select('Inbox') or croak "Could not select: $@ !";
+$imap2->select('Inbox') or croak "Could not select: $@ !";
+
+my @msg_id_2 = $imap2->messages;
+my $msg_id_2 = $msg_id_2[1];
+my $msg_id_1 = ($imap1->messages)[0];
+print "msg_id_1: $msg_id_1\n";
+
+my $string_2 = $imap2->message_string($msg_id_2);
+print $string_2;
+
+my $message_file_1 = "tmp_message_to_file_${$}_1";
+my $message_file_2 = "tmp_message_to_file_${$}_2";
+unlink($message_file_1);
+unlink($message_file_2);
+
+$imap2->message_to_file($message_file_2, $msg_id_2) or croak "Could not message_to_file";
+$imap1->message_to_file($message_file_1, $msg_id_1) or croak "Could not message_to_file";
+
+
+$imap1->logout();
+$imap2->logout();
+
+
diff --git a/t/03_message_to_file.dump b/t/03_message_to_file.dump
new file mode 100644
index 0000000..b01e3ee
--- /dev/null
+++ b/t/03_message_to_file.dump
@@ -0,0 +1,91 @@
+$RCSfile: imapsync,v $ $Revision: 1.244 $ $Date: 2008/02/29 22:43:22 $ 
+Here is a [linux] system (Linux plume 2.6.20.3 #1 Sun Mar 25 06:07:36 CEST 2007 i686)
+with perl 5.8.8 and the module Mail::IMAPClient version used here is 3.05
+Command line used :
+./imapsync --host1 localhost --user1 tata@est.belle --passfile1 /var/tmp/secret.tata --host2 localhost --user2 titi@est.belle --passfile2 /var/tmp/secret.titi --folder INBOX.Trash --syncinternaldates
+will try to use CRAM-MD5 authentication on host1
+will try to use CRAM-MD5 authentication on host2
+From imap server [localhost] port [143] user [tata@est.belle]
+To   imap server [localhost] port [143] user [titi@est.belle]
+Banner : * OK [CAPABILITY IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=PLAIN CRAM-MD5 CRAM-SHA1 IDLE STARTTLS] Courier-IMAP ready. Copyright 1998-2005 Double Precision, Inc.  See COPYING for distribution information.
+Host localhost says it has CAPABILITY for AUTHENTICATE CRAM-MD5
+Success login on [localhost] with user [tata@est.belle] auth [CRAM-MD5]
+Banner : * OK [CAPABILITY IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=PLAIN CRAM-MD5 CRAM-SHA1 IDLE STARTTLS] Courier-IMAP ready. Copyright 1998-2005 Double Precision, Inc.  See COPYING for distribution information.
+Host localhost says it has CAPABILITY for AUTHENTICATE CRAM-MD5
+Success login on [localhost] with user [titi@est.belle] auth [CRAM-MD5]
+From capability : QUOTA STARTTLS NAMESPACE CRAM-SHA1 IDLE AUTH=PLAIN THREAD=ORDEREDSUBJECT SORT UIDPLUS CHILDREN CRAM-MD5 IMAP4REV1 THREAD=REFERENCES
+To   capability : QUOTA STARTTLS NAMESPACE CRAM-SHA1 IDLE AUTH=PLAIN THREAD=ORDEREDSUBJECT SORT UIDPLUS CHILDREN CRAM-MD5 IMAP4REV1 THREAD=REFERENCES
+From state Authenticated
+To   state Authenticated
+From separator and prefix : [.][INBOX.]
+To   separator and prefix : [.][INBOX.]
+++++ Calculating sizes ++++
+From Folder [INBOX.Trash]                       Size:      1012 Messages:     1
+Total size: 1012
+Total messages: 1
+Time : 1 s
+++++ Calculating sizes ++++
+To   Folder [INBOX.Trash]                       Size:         0 Messages:     0
+Total size: 0
+Total messages: 0
+Time : 0 s
+++++ Listing folders ++++
+From folders list : [INBOX.Trash] 
+To   folders list : [INBOX.Trash] 
+++++ Looping on each folder ++++
+From Folder [INBOX.Trash]
+To   Folder [INBOX.Trash]
+++++ From [INBOX.Trash] Parse 1 ++++
+++++ To   [INBOX.Trash] Parse 1 ++++
+++++ Verifying [INBOX.Trash] -> [INBOX.Trash] ++++
++ NO msg #2319 [1c8g+RBA0iMRz+/+c3pqXw:1012] in INBOX.Trash
++ Copying msg #2319:1012 to folder INBOX.Trash
+AAAmessage_string[FCC: imap://tata%40est.belle@localhost/INBOX/Sent
+X-Identity-Key: id2
+Message-ID: <45454886.2030307@localhost>
+Date: Mon, 30 Oct 2006 01:34:14 +0100
+From: TATA <tata@localhost>
+X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; uuencode=0
+User-Agent: Thunderbird 1.5.0.4 (X11/20060722)
+MIME-Version: 1.0
+To: Gilles Lamiral <gilles@louloutte.dyndns.org>
+Subject: Re: test:ophaifaibequahdu
+References: <20030821153335.86EB6FCA2@louloutte.dyndns.org>
+In-Reply-To: <20030821153335.86EB6FCA2@louloutte.dyndns.org>
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
+</head>
+<body bgcolor="#ffffff" text="#000000">
+Gilles Lamiral wrote:
+<blockquote cite="mid20030821153335.86EB6FCA2@louloutte.dyndns.org"
+ type="cite">
+  <pre wrap="">test:ophaifaibequahdu
+
+  </pre>
+</blockquote>
+<br>
+</body>
+</html>
+
+]ZZZ
+AAA1[]ZZZ
+flags from : [\Seen]["30-Oct-2006 01:34:14 +0100"]
+Time : 0 s
+++++ Statistics ++++
+Time                   : 2 sec
+Messages transferred   : 0 
+Messages skipped       : 0
+Total bytes transferred: 0
+Total bytes skipped    : 0
+Total bytes error      : 1012
+Detected 1 errors
+Please, rate imapsync at http://freshmeat.net/projects/imapsync/
+?Happy with this free, open source and gratis GPL software?
+Feel free to thank the author by giving him a book:
+http://www.amazon.com/gp/registry/wishlist/1C9UNDIH3P7R7/
+(or its paypal account gilles.lamiral@laposte.net)
diff --git a/t/04_parse_headers b/t/04_parse_headers
new file mode 100755
index 0000000..0280a65
--- /dev/null
+++ b/t/04_parse_headers
@@ -0,0 +1,21 @@
+#!/usr/bin/perl -w
+
+use Carp;
+use Mail::IMAPClient;
+
+$imap = Mail::IMAPClient->new(Debug => 1);
+$imap->Debug(1);
+$imap->Server('louloutte.dyndns.org');
+$imap->connect() or croak "Error connecting @!";
+$imap->User('MarkOv@est.belle');
+$imap->Password('emhj91ly');
+$imap->login();
+
+$imap->select('Inbox');
+my @messages = $imap->messages();
+
+my $headers = $imap->parse_headers([@messages]);
+
+$imap->logout();
+
+
diff --git a/t/05_parse_headers_ssl b/t/05_parse_headers_ssl
new file mode 100755
index 0000000..bf761ed
--- /dev/null
+++ b/t/05_parse_headers_ssl
@@ -0,0 +1,26 @@
+#!/usr/bin/perl -w
+
+use Carp;
+use Mail::IMAPClient;
+use IO::Socket::SSL;
+
+my $ssl = new IO::Socket::SSL("louloutte.dyndns.org:993");
+
+my $imap = Mail::IMAPClient->new();
+$imap->Socket($ssl);
+
+$imap->Debug(1);
+$imap->Server('louloutte.dyndns.org');
+$imap->connect() or croak "Error connecting @!";
+$imap->User('MarkOv@est.belle');
+$imap->Password('emhj91ly');
+$imap->login();
+
+$imap->select('Inbox');
+my @messages = $imap->messages();
+
+my $headers = $imap->parse_headers([@messages]);
+
+$imap->logout();
+
+
diff --git a/t/06_parse_headers_ssl_titi b/t/06_parse_headers_ssl_titi
new file mode 100755
index 0000000..4ec32de
--- /dev/null
+++ b/t/06_parse_headers_ssl_titi
@@ -0,0 +1,26 @@
+#!/usr/bin/perl -w
+
+use Carp;
+use Mail::IMAPClient;
+use IO::Socket::SSL;
+
+my $ssl = new IO::Socket::SSL("louloutte.dyndns.org:993");
+
+my $imap = Mail::IMAPClient->new();
+$imap->Socket($ssl);
+
+$imap->Debug(1);
+$imap->Server('louloutte.dyndns.org');
+$imap->connect() or croak "Error connecting @!";
+$imap->User('titi@est.belle');
+$imap->Password('HUwtEd');
+$imap->login();
+
+$imap->select('Inbox');
+my @messages = $imap->messages();
+
+my $headers = $imap->parse_headers([@messages]);
+
+$imap->logout();
+
+
diff --git a/tests.sh b/tests.sh
index d7e3ae9..aa89d27 100644
--- a/tests.sh
+++ b/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: tests.sh,v 1.69 2007/12/31 13:38:37 gilles Exp gilles $	
+# $Id: tests.sh,v 1.71 2008/03/19 02:13:55 gilles Exp $  
 
 #### Shell pragmas
 
@@ -11,26 +11,26 @@ set -e    # exit on first failure
 #### functions definitions
 
 echo3() {
-	#echo '#####################################################' >&3
-	echo "$*" >&3
+        #echo '#####################################################' >&3
+        echo "$*" >&3
 }
 
 run_test() {
-	echo3 "#### $test_count $1"
-	$1
-	if test x"$?" = x"0"; then
- 		echo "$1 passed"
-	else
-		echo "$1 failed" >&2
-	fi
+        echo3 "#### $test_count $1"
+        $1
+        if test x"$?" = x"0"; then
+                echo "$1 passed"
+        else
+                echo "$1 failed" >&2
+        fi
 }
 
 run_tests() {
-	for t in "$@"; do
-		test_count=`expr 1 + $test_count`
-		run_test "$t"
-		sleep 1
-	done
+        for t in "$@"; do
+                test_count=`expr 1 + $test_count`
+                run_test "$t"
+                sleep 1
+        done
 }
 
 
@@ -41,12 +41,12 @@ test_count=0
 ##### The tests functions
 
 perl_syntax() {
-	perl -c ./imapsync
+        perl -c ./imapsync
 }
 
 
 no_args() {
-	./imapsync
+        ./imapsync
 }
 
 # list of accounts on plume :
@@ -81,631 +81,650 @@ sendtestmessage() {
 
 
 zzzz() {
-	$CMD_PERL -V
+        $CMD_PERL -V
 
 }
 
 option_version() {
-	$CMD_PERL ./imapsync --version
+        $CMD_PERL ./imapsync --version
 }
 
 
 option_tests() {
-	$CMD_PERL ./imapsync --tests
+        $CMD_PERL ./imapsync --tests
 }
 
 
 first_sync_dry() {
-	$CMD_PERL ./imapsync \
-	    --host1 localhost --user1 toto@est.belle \
-	    --passfile1 /var/tmp/secret1 \
-	    --host2 localhost --user2 titi@est.belle \
-	    --passfile2 /var/tmp/secret.titi \
-	    --noauthmd5 --dry
+        $CMD_PERL ./imapsync \
+            --host1 localhost --user1 toto@est.belle \
+            --passfile1 /var/tmp/secret1 \
+            --host2 localhost --user2 titi@est.belle \
+            --passfile2 /var/tmp/secret.titi \
+            --noauthmd5 --dry
 }
 
 
 
 first_sync() {
-	$CMD_PERL ./imapsync \
-	    --host1 localhost --user1 toto@est.belle \
-	    --passfile1 /var/tmp/secret1 \
-	    --host2 localhost --user2 titi@est.belle \
-	    --passfile2 /var/tmp/secret.titi \
-	    --noauthmd5
+        $CMD_PERL ./imapsync \
+            --host1 localhost --user1 toto@est.belle \
+            --passfile1 /var/tmp/secret1 \
+            --host2 localhost --user2 titi@est.belle \
+            --passfile2 /var/tmp/secret.titi \
+            --noauthmd5
 }
 
 
 locallocal() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		sendtestmessage
-		$CMD_PERL  ./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                sendtestmessage
+                $CMD_PERL  ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi
+        else
+                :
+        fi
 }
 
 
 
 ll_folder() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		$CMD_PERL ./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.yop --folder INBOX.Trash
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.yop --folder INBOX.Trash
+        else
+                :
+        fi
 }
 
 ll_folderrec() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		$CMD_PERL ./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folderrec INBOX.yop 
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folderrec INBOX.yop 
+        else
+                :
+        fi
 }
 
 
 
 ll_buffersize() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		$CMD_PERL ./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--buffersize 8
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --buffersize 8
+        else
+                :
+        fi
 }
 
 
 
 ll_justfolders() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		$CMD_PERL ./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfolders 
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfolders 
+        else
+                :
+        fi
 }
 
 
 ll_prefix12() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		$CMD_PERL ./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.qqq  \
-		--prefix1 INBOX.\
-		--prefix2 INBOX. 
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.qqq  \
+                --prefix1 INBOX.\
+                --prefix2 INBOX. 
+        else
+                :
+        fi
 }
 
 
 
 ll_internaldate() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		sendtestmessage
-		./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX  \
-		--syncinternaldates
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                sendtestmessage
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX  \
+                --syncinternaldates
+        else
+                :
+        fi
 }
 
 
 
 
 ll_folder_rev() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost  --user1 titi@est.belle \
-		--passfile1 /var/tmp/secret.titi \
-		--host2 localhost --user2 tata@est.belle \
-		--passfile2 /var/tmp/secret.tata \
-		--folder INBOX.yop
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 titi@est.belle \
+                --passfile1 /var/tmp/secret.titi \
+                --host2 localhost --user2 tata@est.belle \
+                --passfile2 /var/tmp/secret.tata \
+                --folder INBOX.yop
+        else
+                :
+        fi
 }
 
 ll_subscribed()
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--subscribed
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --subscribed
+        else
+                :
+        fi
 }
 
 
 ll_subscribe() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--subscribed --subscribe
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --subscribed --subscribe
+        else
+                :
+        fi
 }
 
 ll_justconnect() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync    \
-		--host2 localhost \
-		--host1 localhost \
-		--justconnect
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync    \
+                --host2 localhost \
+                --host1 localhost \
+                --justconnect
+        else
+                :
+        fi
 }
 
 ll_justfoldersizes() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes
+        else
+                :
+        fi
 }
 
 
 
 ll_authmd5() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes --authmd5
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes --authmd5
+        else
+                :
+        fi
 }
 
 ll_noauthmd5() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes --noauthmd5
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes --noauthmd5
+        else
+                :
+        fi
 }
 
 
 ll_maxage() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--maxage 1
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --maxage 1
+        else
+                :
+        fi
 }
 
 
 
 ll_maxsize() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--maxsize 10
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --maxsize 10
+        else
+                :
+        fi
 }
 
 ll_skipsize() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--skipsize --folder INBOX.yop.yap
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --skipsize --folder INBOX.yop.yap
+        else
+                :
+        fi
 }
 
 ll_skipheader() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--skipheader 'X-.*' --folder INBOX.yop.yap
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --skipheader 'X-.*' --folder INBOX.yop.yap
+        else
+                :
+        fi
 }
 
 
 
 ll_include() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--include '^INBOX.yop'
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --include '^INBOX.yop'
+        else
+                :
+        fi
 }
 
 ll_exclude() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--exclude '^INBOX.yop'
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --exclude '^INBOX.yop'
+        else
+                :
+        fi
 }
 
 
 
 ll_regextrans2() 
 {
-	sendtestmessage
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--regextrans2 's/yop/yopX/'
-	else
-		:
-	fi
+        sendtestmessage
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --regextrans2 's/yop/yopX/'
+        else
+                :
+        fi
 }
 
 ll_sep2() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.yop.yap \
-		--sep2 '\\' --dry
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.yop.yap \
+                --sep2 '\\' --dry
+        else
+                :
+        fi
 }
 
 ll_bad_login()
 {
-    ! ./imapsync \
-	--host1 localhost --user1 toto@est.belle \
-	--passfile1 /var/tmp/secret1 \
-	--host2 localhost --user2 notiti@est.belle \
-	--passfile2 /var/tmp/secret2
+    ! $CMD_PERL ./imapsync \
+        --host1 localhost --user1 toto@est.belle \
+        --passfile1 /var/tmp/secret1 \
+        --host2 localhost --user2 notiti@est.belle \
+        --passfile2 /var/tmp/secret2
    
 }
 
 ll_bad_host()
 {
-    ! ./imapsync \
-	--host1 badhost --user1 toto@est.belle \
-	--passfile1 /var/tmp/secret1 \
-	--host2 badhost --user2 titi@est.belle \
-	--passfile2 /var/tmp/secret2
+    ! $CMD_PERL ./imapsync \
+        --host1 badhost --user1 toto@est.belle \
+        --passfile1 /var/tmp/secret1 \
+        --host2 badhost --user2 titi@est.belle \
+        --passfile2 /var/tmp/secret2
    
 }
 
 ll_bad_host_ssl()
 {
-    ! ./imapsync \
-	--host1 badhost --user1 toto@est.belle \
-	--passfile1 /var/tmp/secret1 \
-	--host2 badhost --user2 titi@est.belle \
-	--passfile2 /var/tmp/secret2 \
+    ! $CMD_PERL ./imapsync \
+        --host1 badhost --user1 toto@est.belle \
+        --passfile1 /var/tmp/secret1 \
+        --host2 badhost --user2 titi@est.belle \
+        --passfile2 /var/tmp/secret2 \
         --ssl1 --ssl2
 }
 
 
 ll_justfoldersizes()
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes
+        else
+                :
+        fi
 }
 
 
 
 ll_useheader() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.yop.yap \
-		--useheader 'Message-ID' \
-		--dry --debug	
-		echo 'rm /home/vmail/tata/.yop.yap/cur/*'
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.yop.yap \
+                --useheader 'Message-ID' \
+                --dry --debug   
+                echo 'rm /home/vmail/tata/.yop.yap/cur/*'
+        else
+                :
+        fi
 }
 
 
 ll_regexmess() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.yop.yap \
-		--regexmess 's/\157/O/g' \
-		--regexmess 's/p/Z/g' \
-		--dry --debug
-		echo 'rm /home/vmail/titi/.yop.yap/cur/*'
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.yop.yap \
+                --regexmess 's/\157/O/g' \
+                --regexmess 's/p/Z/g' \
+                --dry --debug
+                echo 'rm /home/vmail/titi/.yop.yap/cur/*'
+        else
+                :
+        fi
+}
+
+ll_regexmess_scwchu() 
+{
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.scwchu \
+                --regexmess 's{\A(.*?(?! ^$))^Date:(.*?)$}{$1Date:$2\nReceived: From; $2}gxms' \
+                --skipsize --skipheader 'Received: From;' \
+                --debug 
+                echo 'rm /home/vmail/titi/.scwchu/cur/*'
+        else
+                :
+        fi
 }
 
 
 ll_flags() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.yop.yap \
-		--dry --debug
-		echo 'rm /home/vmail/titi/.yop.yap/cur/*'
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.yop.yap \
+                --dry --debug
+                echo 'rm /home/vmail/titi/.yop.yap/cur/*'
+        else
+                :
+        fi
 }
 
 ll_regex_flag() 
 {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.yop.yap \
-		--dry --debug --regexflag 's/\\Answered/\\AnXweXed/g'
-		
-		echo 'rm /home/vmail/titi/.yop.yap/cur/*'
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.yop.yap \
+                --dry --debug --regexflag 's/\\Answered/\\AnXweXed/g'
+                
+                echo 'rm /home/vmail/titi/.yop.yap/cur/*'
+        else
+                :
+        fi
 }
 
 
 ll_ssl() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
 		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--ssl1 --ssl2
-	else
-		:
-	fi
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --ssl1 --ssl2
+        else
+                :
+        fi
 }
 
 ll_authmech_PLAIN() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes --nofoldersizes \
-		--authmech1 PLAIN --authmech2 PLAIN
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes --nofoldersizes \
+                --authmech1 PLAIN --authmech2 PLAIN
+        else
+                :
+        fi
 }
 
 ll_authuser() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes --nofoldersizes \
-		--authuser2 titi@est.belle
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes --nofoldersizes \
+                --authuser2 titi@est.belle
+        else
+                :
+        fi
 }
 
 
 
 
 ll_authmech_LOGIN() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes --nofoldersizes \
-		--authmech1 LOGIN --authmech2 LOGIN 
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes --nofoldersizes \
+                --authmech1 LOGIN --authmech2 LOGIN 
+        else
+                :
+        fi
 }
 
 ll_authmech_CRAMMD5() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--justfoldersizes --nofoldersizes \
-		--authmech1 CRAM-MD5 --authmech2 CRAM-MD5 
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --justfoldersizes --nofoldersizes \
+                --authmech1 CRAM-MD5 --authmech2 CRAM-MD5 
+        else
+                :
+        fi
 }
 
 ll_delete2() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
                 --folder INBOX \
-		--delete2 --expunge2
-	else
-		:
-	fi
+                --delete2 --expunge2
+        else
+                :
+        fi
 }
 
 ll_bigmail() {
-	if test X`hostname` = X"plume"; then
-		echo3 Here is plume
-		./imapsync \
-		--host1 localhost  --user1 tata@est.belle \
-		--passfile1 /var/tmp/secret.tata \
-		--host2 localhost --user2 titi@est.belle \
-		--passfile2 /var/tmp/secret.titi \
-		--folder INBOX.bigmail
-		echo 'rm  /home/vmail/titi/.bigmail/cur/*'
-	else
-		:
-	fi
+        if test X`hostname` = X"plume"; then
+                echo3 Here is plume
+                $CMD_PERL ./imapsync \
+                --host1 localhost  --user1 tata@est.belle \
+                --passfile1 /var/tmp/secret.tata \
+                --host2 localhost --user2 titi@est.belle \
+                --passfile2 /var/tmp/secret.titi \
+                --folder INBOX.bigmail
+                echo 'rm  /home/vmail/titi/.bigmail/cur/*'
+        else
+                :
+        fi
 }
 
 
 msw() {
-	sendtestmessage toto@est.belle
-	scp imapsync  Admin@192.168.68.77:'C:/msys/1.0/home/Admin/imapsync/imapsync'
-	ssh Admin@192.168.68.77 'C:/msys/1.0/home/Admin/imapsync/test.bat'
+        sendtestmessage toto@est.belle
+        scp imapsync  Admin@192.168.68.77:'C:/msys/1.0/home/Admin/imapsync/imapsync'
+        ssh Admin@192.168.68.77 'C:/msys/1.0/home/Admin/imapsync/test.bat'
 }
 
 
@@ -716,14 +735,14 @@ msw() {
 big_transfert()
 {
     date1=`date`
-    { ./imapsync \
-	--host1 louloutte --user1 gilles \
-	--passfile1 /var/tmp/secret \
-	--host2 plume --user2 tete@est.belle \
-	--passfile2 /var/tmp/secret.tete \
-	--subscribed --foldersizes --noauthmd5 \
+    { $CMD_PERL ./imapsync \
+        --host1 louloutte --user1 gilles \
+        --passfile1 /var/tmp/secret \
+        --host2 plume --user2 tete@est.belle \
+        --passfile2 /var/tmp/secret.tete \
+        --subscribed --foldersizes --noauthmd5 \
         --fast --folder INBOX.Backup \
-	--useheader Message-ID --useheader Received || \
+        --useheader Message-ID --useheader Received || \
     true
     }
     date2=`date`
@@ -733,13 +752,13 @@ big_transfert()
 big_transfert_sizes_only()
 {
     date1=`date`
-    { ./imapsync \
-	--host1 louloutte --user1 gilles \
-	--passfile1 /var/tmp/secret \
-	--host2 plume --user2 tete@est.belle \
-	--passfile2 /var/tmp/secret.tete \
-	--subscribed  --noauthmd5 \
-	--justfoldersizes  || \
+    { $CMD_PERL ./imapsync \
+        --host1 louloutte --user1 gilles \
+        --passfile1 /var/tmp/secret \
+        --host2 plume --user2 tete@est.belle \
+        --passfile2 /var/tmp/secret.tete \
+        --subscribed  --noauthmd5 \
+        --justfoldersizes  || \
     true
     }
     date2=`date`
@@ -752,11 +771,11 @@ dprof()
 {
     date1=`date`
     { perl -d:DProf ./imapsync \
-	--host1 louloutte --user1 gilles \
-	--passfile1 /var/tmp/secret \
-	--host2 plume --user2 tete@est.belle \
-	--passfile2 /var/tmp/secret.tete \
-	--subscribed --foldersizes --noauthmd5 \
+        --host1 louloutte --user1 gilles \
+        --passfile1 /var/tmp/secret \
+        --host2 plume --user2 tete@est.belle \
+        --passfile2 /var/tmp/secret.tete \
+        --subscribed --foldersizes --noauthmd5 \
         --folder INBOX.Trash || \
     true
     }
@@ -768,25 +787,25 @@ dprof()
 essnet_justconnect()
 {
 ./imapsync \
-	--host1 mail2.softwareuno.com \
-	--user1 gilles@mail2.softwareuno.com  \
-	--passfile1 /var/tmp/secret.prw \
-	--host2 mail.softwareuno.com \
-	--user2 gilles@softwareuno.com \
-	--passfile2 /var/tmp/secret.prw \
-	--dry --noauthmd5 --sep1 / --foldersizes --justconnect
+        --host1 mail2.softwareuno.com \
+        --user1 gilles@mail2.softwareuno.com  \
+        --passfile1 /var/tmp/secret.prw \
+        --host2 mail.softwareuno.com \
+        --user2 gilles@softwareuno.com \
+        --passfile2 /var/tmp/secret.prw \
+        --dry --noauthmd5 --sep1 / --foldersizes --justconnect
 }
 
 essnet_mail2_mail()
 {
 ./imapsync \
-	--host1 mail2.softwareuno.com \
-	--user1 gilles@mail2.softwareuno.com  \
-	--passfile1 /var/tmp/secret.prw \
-	--host2 mail.softwareuno.com \
-	--user2 gilles@softwareuno.com \
-	--passfile2 /var/tmp/secret.prw \
-	--noauthmd5 --sep1 / --foldersizes \
+        --host1 mail2.softwareuno.com \
+        --user1 gilles@mail2.softwareuno.com  \
+        --passfile1 /var/tmp/secret.prw \
+        --host2 mail.softwareuno.com \
+        --user2 gilles@softwareuno.com \
+        --passfile2 /var/tmp/secret.prw \
+        --noauthmd5 --sep1 / --foldersizes \
         --prefix2 "INBOX/" --regextrans2 's¤INBOX/INBOX¤INBOX¤'
 }
 
@@ -794,17 +813,17 @@ essnet_mail2_mail_t123()
 {
 
 for user1 in test1 test2 test3; do
-	./imapsync \
-	--host1 mail2.softwareuno.com \
-	--user1 ${user1}@mail2.softwareuno.com  \
-	--passfile1 /var/tmp/secret.prw \
-	--host2 mail.softwareuno.com \
-	--user2 gilles@softwareuno.com \
-	--passfile2 /var/tmp/secret.prw \
-	--noauthmd5 --sep1 / --foldersizes \
-	--prefix2 "INBOX/" --regextrans2 's¤INBOX/INBOX¤INBOX¤' \
+        ./imapsync \
+        --host1 mail2.softwareuno.com \
+        --user1 ${user1}@mail2.softwareuno.com  \
+        --passfile1 /var/tmp/secret.prw \
+        --host2 mail.softwareuno.com \
+        --user2 gilles@softwareuno.com \
+        --passfile2 /var/tmp/secret.prw \
+        --noauthmd5 --sep1 / --foldersizes \
+        --prefix2 "INBOX/" --regextrans2 's¤INBOX/INBOX¤INBOX¤' \
         --debug \
-	|| true
+        || true
 done
 }
 
@@ -812,11 +831,11 @@ done
 essnet_plume2()
 {
 ./imapsync \
-	--host1 mail2.softwareuno.com \
-	--user1 gilles@mail2.softwareuno.com  \
-	--passfile1 /var/tmp/secret.prw \
-	--host2 plume --user2 tata@est.belle \
-	--passfile2 /var/tmp/secret.tata \
+        --host1 mail2.softwareuno.com \
+        --user1 gilles@mail2.softwareuno.com  \
+        --passfile1 /var/tmp/secret.prw \
+        --host2 plume --user2 tata@est.belle \
+        --passfile2 /var/tmp/secret.tata \
         --noauthmd5 --sep1 / --foldersizes \
         --prefix2 INBOX. --regextrans2 's¤INBOX.INBOX¤INBOX¤'
 }
@@ -825,97 +844,97 @@ dynamicquest_1()
 {
 
 perl -I bugs/lib ./imapsync \
-	--host1 69.38.48.81 \
-	--user1 testuser1@dq.com \
-	--passfile1 /var/tmp/secret.dynamicquest \
-	--host2 69.38.48.81 \
-	--user2 testuser2@dq.com \
-	--passfile2 /var/tmp/secret.dynamicquest \
-	--noauthmd5 --sep1 "/" --sep2 "/" \
-	--justconnect --dry 
+        --host1 69.38.48.81 \
+        --user1 testuser1@dq.com \
+        --passfile1 /var/tmp/secret.dynamicquest \
+        --host2 69.38.48.81 \
+        --user2 testuser2@dq.com \
+        --passfile2 /var/tmp/secret.dynamicquest \
+        --noauthmd5 --sep1 "/" --sep2 "/" \
+        --justconnect --dry 
 }
 
 dynamicquest_2()
 {
 
 perl -I bugs/lib ./imapsync \
-	--host1 mail.dynamicquest.com \
-	--user1 gomez \
-	--passfile1 /var/tmp/secret.dynamicquestgomez \
-	--host2 69.38.48.81 \
-	--user2 testuser2@dq.com \
-	--passfile2 /var/tmp/secret.dynamicquest \
-	--noauthmd5 \
-	--justconnect --dry 
+        --host1 mail.dynamicquest.com \
+        --user1 gomez \
+        --passfile1 /var/tmp/secret.dynamicquestgomez \
+        --host2 69.38.48.81 \
+        --user2 testuser2@dq.com \
+        --passfile2 /var/tmp/secret.dynamicquest \
+        --noauthmd5 \
+        --justconnect --dry 
 }
 
 dynamicquest_3()
 {
 
 perl -I bugs/lib ./imapsync \
-	--host1 loul \
-	--user1 tata \
-	--passfile1 /var/tmp/secret.tata \
-	--host2 69.38.48.81 \
-	--user2 testuser2@dq.com \
-	--passfile2 /var/tmp/secret.dynamicquest \
-	--noauthmd5 --sep2 "/" --debug --debugimap
-	
+        --host1 loul \
+        --user1 tata \
+        --passfile1 /var/tmp/secret.tata \
+        --host2 69.38.48.81 \
+        --user2 testuser2@dq.com \
+        --passfile2 /var/tmp/secret.dynamicquest \
+        --noauthmd5 --sep2 "/" --debug --debugimap
+        
 }
 
 mailenable() {
-	./imapsync \
-	    --user1 imapsync@damashekconsulting.com \
-	    --host1  imap.damashekconsulting.com  \
-	    --passfile1 /var/tmp/secret.damashek \
-	    --sep1 "." --prefix1 "" \
-	    --host2 localhost --user2 toto@est.belle \
-	    --passfile2 /var/tmp/secret1 \
-	    --noauthmd5
+        ./imapsync \
+            --user1 imapsync@damashekconsulting.com \
+            --host1  imap.damashekconsulting.com  \
+            --passfile1 /var/tmp/secret.damashek \
+            --sep1 "." --prefix1 "" \
+            --host2 localhost --user2 toto@est.belle \
+            --passfile2 /var/tmp/secret1 \
+            --noauthmd5
 }
 
 ariasolutions() {
-	./imapsync \
-	--host1 209.17.174.20 \
-	--user1 chrisw@canadapack.com \
-	--passfile1 /var/tmp/secret.ariasolutions \
-	--host2 209.17.174.20 \
-	--user2 chrisw@canadapack.com \
-	--passfile2 /var/tmp/secret.ariasolutions \
-	--dry --noauthmd5 --justfoldersizes
+        ./imapsync \
+        --host1 209.17.174.20 \
+        --user1 chrisw@canadapack.com \
+        --passfile1 /var/tmp/secret.ariasolutions \
+        --host2 209.17.174.20 \
+        --user2 chrisw@canadapack.com \
+        --passfile2 /var/tmp/secret.ariasolutions \
+        --dry --noauthmd5 --justfoldersizes
 
-	./imapsync \
-	--host1 209.17.174.20 \
-	--user1 test@domain.local \
-	--passfile1 /var/tmp/secret.ariasolutions \
-	--host2 209.17.174.20 \
-	--user2 test@domain.local \
-	--passfile2 /var/tmp/secret.ariasolutions \
-	--dry --noauthmd5 --ssl1
+        ./imapsync \
+        --host1 209.17.174.20 \
+        --user1 test@domain.local \
+        --passfile1 /var/tmp/secret.ariasolutions \
+        --host2 209.17.174.20 \
+        --user2 test@domain.local \
+        --passfile2 /var/tmp/secret.ariasolutions \
+        --dry --noauthmd5 --ssl1
 
 # hang after auth failure 
-	./imapsync \
-	--host1 209.17.174.20 \
-	--user1 test@domain.local \
-	--passfile1 /var/tmp/secret.ariasolutions \
-	--host2 209.17.174.20 \
-	--user2 test@domain.local \
-	--passfile2 /var/tmp/secret.ariasolutions \
-	--dry --debug --debugimap
+        ./imapsync \
+        --host1 209.17.174.20 \
+        --user1 test@domain.local \
+        --passfile1 /var/tmp/secret.ariasolutions \
+        --host2 209.17.174.20 \
+        --user2 test@domain.local \
+        --passfile2 /var/tmp/secret.ariasolutions \
+        --dry --debug --debugimap
 
 }
 
 
 ariasolutions2() {
-	./imapsync \
-	--host1 209.17.174.12 \
-	--user1 chrisw@basebuilding.net \
-	--passfile1 /var/tmp/secret.ariasolutions2 \
-	--host2 209.17.174.20 \
-	--user2 chrisw@basebuilding.net\
-	--passfile2 /var/tmp/secret.ariasolutions2 \
-	--noauthmd5 --syncinternaldates
-	# --dry --debug --debugimap
+        ./imapsync \
+        --host1 209.17.174.12 \
+        --user1 chrisw@basebuilding.net \
+        --passfile1 /var/tmp/secret.ariasolutions2 \
+        --host2 209.17.174.20 \
+        --user2 chrisw@basebuilding.net\
+        --passfile2 /var/tmp/secret.ariasolutions2 \
+        --noauthmd5 --syncinternaldates
+        # --dry --debug --debugimap
 
 
 }
@@ -935,48 +954,49 @@ run_tests perl_syntax
 # pl : plume -> louloutte
 
 test $# -eq 0 && run_tests \
-	no_args \
+        no_args \
         option_version \
-	option_tests \
-	first_sync \
-	locallocal \
-	ll_folder \
- 	ll_buffersize \
-	ll_justfolders \
- 	ll_prefix12 \
- 	ll_internaldate \
- 	ll_folder_rev \
- 	ll_subscribed \
- 	ll_subscribe \
- 	ll_justconnect \
-	ll_justfoldersizes \
-	ll_authmd5 \
-	ll_noauthmd5 \
-	ll_maxage \
- 	ll_maxsize \
-	ll_skipsize \
-	ll_skipheader \
-	ll_include \
-	ll_exclude \
-	ll_regextrans2 \
-	ll_sep2 \
-	ll_bad_login \
-	ll_bad_host \
-	ll_bad_host_ssl \
-	ll_justfoldersizes \
-	ll_useheader \
-	ll_regexmess \
-	ll_flags \
-	ll_regex_flag \
-	ll_ssl \
-	ll_authmech_PLAIN \
-	ll_authmech_LOGIN \
-	ll_authmech_CRAMMD5 \
-	ll_authuser \
-	ll_delete2 \
-	ll_folderrec \
-	ll_bigmail \
-	msw
+        option_tests \
+        first_sync \
+        locallocal \
+        ll_folder \
+        ll_buffersize \
+        ll_justfolders \
+        ll_prefix12 \
+        ll_internaldate \
+        ll_folder_rev \
+        ll_subscribed \
+        ll_subscribe \
+        ll_justconnect \
+        ll_justfoldersizes \
+        ll_authmd5 \
+        ll_noauthmd5 \
+        ll_maxage \
+        ll_maxsize \
+        ll_skipsize \
+        ll_skipheader \
+        ll_include \
+        ll_exclude \
+        ll_regextrans2 \
+        ll_sep2 \
+        ll_bad_login \
+        ll_bad_host \
+        ll_bad_host_ssl \
+        ll_justfoldersizes \
+        ll_useheader \
+        ll_regexmess \
+        ll_regexmess_scwchu \
+        ll_flags \
+        ll_regex_flag \
+        ll_ssl \
+        ll_authmech_PLAIN \
+        ll_authmech_LOGIN \
+        ll_authmech_CRAMMD5 \
+        ll_authuser \
+        ll_delete2 \
+        ll_folderrec \
+        ll_bigmail \
+        msw