Updated unit tests

author: Hoa V. Dinh <dinh.viet.hoa@gmail.com> 2014-11-05 18:24:12 -0800
committer: Hoa V. Dinh <dinh.viet.hoa@gmail.com> 2014-11-05 18:24:12 -0800
commit: d4799b94e4d99135a153f6304e0696256360353a (patch)
tree: 51e2f2dfb7e65269f6c8105292d72058a1adf4fe /unittest
parent: c3727496446f2aba63b3a032e551c76eb28db5eb (diff)
118 files changed, 364 insertions, 111 deletions
diff --git a/unittest/data/parser/output/mbox/jwz/102 b/unittest/data/parser/output/mbox/jwz/102
index 75168a45..34f8db46 100644
--- a/unittest/data/parser/output/mbox/jwz/102
+++ b/unittest/data/parser/output/mbox/jwz/102
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Raph Levien","mailbox":"raph@callisto.hip.berkeley.edu"},"extraHeaders":{"Return-Path":"raph@callisto.hip.berkeley.edu","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\";\u000a   micalg=rsa-md5; boundary=\"7oU2Ma36WUas7M\"","X-Mozilla-Status":"0005","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id EAA18301; Thu, 25 Apr 1996 04:30:51 -0700","Mime-Version":"1.0","Content-Length":"1784"},"date":"978307200","messageID":"199604251026.DAA00979@callisto.hip.berkeley.edu","receivedDate":"978307200","subject":"Multipart\/signed message format","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Raph Levien","mailbox":"raph@callisto.hip.berkeley.edu"},"extraHeaders":{"Return-Path":"raph@callisto.hip.berkeley.edu","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\";\u000a   micalg=rsa-md5; boundary=\"7oU2Ma36WUas7M\"","X-Mozilla-Status":"0005","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id EAA18301; Thu, 25 Apr 1996 04:30:51 -0700","Mime-Version":"1.0","Content-Length":"1784"},"date":"830428017","messageID":"199604251026.DAA00979@callisto.hip.berkeley.edu","receivedDate":"830428017","subject":"Multipart\/signed message format","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/103 b/unittest/data/parser/output/mbox/jwz/103
index a39632f3..dedad034 100644
--- a/unittest/data/parser/output/mbox/jwz/103
+++ b/unittest/data/parser/output/mbox/jwz/103
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"S\/MIME Test Account","mailbox":"smime@strataware.com"},{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Lisa Repka","mailbox":"repka@netscape.com"},{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"},"extraHeaders":{"Return-Path":"<rosenqui@krusty.strataware.com>","Content-Type":"multipart\/mixed; boundary=\"-ABC\"","X-Mozilla-Status":"0005","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.01) with SMTP id AAA16354;\u000a          Fri, 8 Nov 1996 11:45:02 -0700","Mime-Version":"1.0","Content-Length":"3409"},"date":"978307200","messageID":"199611081945.OAA29470@krusty.strataware.com","receivedDate":"978307200","subject":"My encryption certificate for S\/MIME testing","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-mime","inlineAttachment":"1","class":"mailcore::Attachment","filename":"eric.p7c"}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"S\/MIME Test Account","mailbox":"smime@strataware.com"},{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Lisa Repka","mailbox":"repka@netscape.com"},{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"},"extraHeaders":{"Return-Path":"<rosenqui@krusty.strataware.com>","Content-Type":"multipart\/mixed; boundary=\"-ABC\"","X-Mozilla-Status":"0005","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.01) with SMTP id AAA16354;\u000a          Fri, 8 Nov 1996 11:45:02 -0700","Mime-Version":"1.0","Content-Length":"3409"},"date":"847482318","messageID":"199611081945.OAA29470@krusty.strataware.com","receivedDate":"847482318","subject":"My encryption certificate for S\/MIME testing","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-mime","inlineAttachment":"1","class":"mailcore::Attachment","filename":"eric.p7c"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/104 b/unittest/data/parser/output/mbox/jwz/104
index acd35028..4fb431c4 100644
--- a/unittest/data/parser/output/mbox/jwz/104
+++ b/unittest/data/parser/output/mbox/jwz/104
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"},{"class":"mailcore::Address","displayName":"Michel Ranger","mailbox":"rangerm@entrust.com"},{"class":"mailcore::Address","displayName":"Ron Vandergeest","mailbox":"rvander@entrust.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"S\/MIME Developers","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"},"extraHeaders":{"Return-Path":"<owner-smime-dev@RSA.COM>","Content-Type":"multipart\/mixed; boundary=\"961121152248_14052\"","X-Mozilla-Status":"0005","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.01) with SMTP id AAA27656;\u000a          Thu, 21 Nov 1996 13:20:43 -0700","Mime-Version":"1.0","Content-Length":"5854","Precedence":"bulk"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"199611212110.QAA14653@krusty.strataware.com","receivedDate":"978307200","subject":"My encryption certificate for S\/MIME testing","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-mime","inlineAttachment":"1","class":"mailcore::Attachment","filename":"eric.p7c"}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"},{"class":"mailcore::Address","displayName":"Michel Ranger","mailbox":"rangerm@entrust.com"},{"class":"mailcore::Address","displayName":"Ron Vandergeest","mailbox":"rvander@entrust.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"S\/MIME Developers","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Eric Rosenquist","mailbox":"rosenqui@strataware.com"},"extraHeaders":{"Return-Path":"<owner-smime-dev@RSA.COM>","Content-Type":"multipart\/mixed; boundary=\"961121152248_14052\"","X-Mozilla-Status":"0005","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.01) with SMTP id AAA27656;\u000a          Thu, 21 Nov 1996 13:20:43 -0700","Mime-Version":"1.0","Content-Length":"5854","Precedence":"bulk"},"date":"848610623","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"199611212110.QAA14653@krusty.strataware.com","receivedDate":"848610623","subject":"My encryption certificate for S\/MIME testing","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-mime","inlineAttachment":"1","class":"mailcore::Attachment","filename":"eric.p7c"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/106 b/unittest/data/parser/output/mbox/jwz/106
index f1aca458..b7d0d7e3 100644
--- a/unittest/data/parser/output/mbox/jwz/106
+++ b/unittest/data/parser/output/mbox/jwz/106
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=sha1; boundary=\"------------167E2781446B\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Content-Length":"15749","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"978307200","subject":"signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"image\/jpeg","inlineAttachment":"1","class":"mailcore::Attachment","filename":"bad-frog.jpg"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=sha1; boundary=\"------------167E2781446B\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Content-Length":"15749","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"850356356","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"850356356","subject":"signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"image\/jpeg","inlineAttachment":"1","class":"mailcore::Attachment","filename":"bad-frog.jpg"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/107 b/unittest/data/parser/output/mbox/jwz/107
index 255a9aaa..deeb0374 100644
--- a/unittest/data/parser/output/mbox/jwz/107
+++ b/unittest/data/parser/output/mbox/jwz/107
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"978307200","subject":"signed frog 2","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"850356356","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"850356356","subject":"signed frog 2","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/108 b/unittest/data/parser/output/mbox/jwz/108
index 853bed20..391248cf 100644
--- a/unittest/data/parser/output/mbox/jwz/108
+++ b/unittest/data/parser/output/mbox/jwz/108
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"978307200","subject":"doubly signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"850356356","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"850356356","subject":"doubly signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/109 b/unittest/data/parser/output/mbox/jwz/109
index 00032592..0d1018f1 100644
--- a/unittest/data/parser/output/mbox/jwz/109
+++ b/unittest/data/parser/output/mbox/jwz/109
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"978307200","subject":"triply signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"850356356","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"850356356","subject":"triply signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/11 b/unittest/data/parser/output/mbox/jwz/11
index 5b6e2a01..9aa44879 100644
--- a/unittest/data/parser/output/mbox/jwz/11
+++ b/unittest/data/parser/output/mbox/jwz/11
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","mailbox":"bob@cs.su.oz.au"},"extraHeaders":{"Return-Path":"<bob@sarad.cs.su.oz.au>","Content-Type":"image\/pbm","MIME-Version":"RFC-XXXX","Content-Transfer-Encoding":"base64","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA11583> for nsb; Thu, 26 Dec 91 15:15:38 EST"},"date":"978307200","messageID":"9112262015.AA13190@thumper.bellcore.com","receivedDate":"978307200","subject":"couldn't resist this","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"image\/pbm","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","mailbox":"bob@cs.su.oz.au"},"extraHeaders":{"Return-Path":"<bob@sarad.cs.su.oz.au>","Content-Type":"image\/pbm","MIME-Version":"RFC-XXXX","Content-Transfer-Encoding":"base64","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA11583> for nsb; Thu, 26 Dec 91 15:15:38 EST"},"date":"693780300","messageID":"9112262015.AA13190@thumper.bellcore.com","receivedDate":"693780300","subject":"couldn't resist this","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"image\/pbm","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/110 b/unittest/data/parser/output/mbox/jwz/110
index 1468991f..6f547132 100644
--- a/unittest/data/parser/output/mbox/jwz/110
+++ b/unittest/data/parser/output/mbox/jwz/110
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"978307200","subject":"quadruply signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@urchin.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"application\/x-pkcs7-mime","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Received":"from urchin.mcom.com ([205.217.237.40]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA17435\u000a          for <jwz@dredd.mcom.com>; Wed, 11 Dec 1996 18:05:59 -0800","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"850356356","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"32AF6884.41C6@netscape.com","receivedDate":"850356356","subject":"quadruply signed frog","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/111 b/unittest/data/parser/output/mbox/jwz/111
index adec891e..b6fc7d68 100644
--- a/unittest/data/parser/output/mbox/jwz/111
+++ b/unittest/data/parser/output/mbox/jwz/111
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"blaker@craswell.com"},"extraHeaders":{"Return-Path":"<blaker@craswell.com>","Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Windows Eudora Pro Version 3.0 (32)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA19742\u000a          for <jwz@dredd.mcom.com>; Fri, 13 Dec 1996 14:59:31 -0800","X-Sender":"blaker@mail.craswell.com","Content-Length":"1431"},"date":"978307200","messageID":"3.0.32.19961213150855.009172e0@mail.craswell.com","receivedDate":"978307200","subject":"Re: can you send me an encrypted message?","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"blaker@craswell.com"},"extraHeaders":{"Return-Path":"<blaker@craswell.com>","Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Windows Eudora Pro Version 3.0 (32)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA19742\u000a          for <jwz@dredd.mcom.com>; Fri, 13 Dec 1996 14:59:31 -0800","X-Sender":"blaker@mail.craswell.com","Content-Length":"1431"},"date":"850518582","messageID":"3.0.32.19961213150855.009172e0@mail.craswell.com","receivedDate":"850518582","subject":"Re: can you send me an encrypted message?","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/112 b/unittest/data/parser/output/mbox/jwz/112
index 7e50f3cf..1611843b 100644
--- a/unittest/data/parser/output/mbox/jwz/112
+++ b/unittest/data/parser/output/mbox/jwz/112
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"blaker@craswell.com"},"extraHeaders":{"Return-Path":"<blaker@craswell.com>","Content-Type":"multipart\/signed; boundary=\u000a \"---=_=_ 659214770-385040-15143392 _=_=---\"; micalg=rsa-sha1; protocol=\u000a \"application\/x-pkcs7-signature\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Windows Eudora Pro Version 3.0 (32)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA19910\u000a          for <jwz@dredd.mcom.com>; Fri, 13 Dec 1996 15:00:10 -0800","X-Sender":"blaker@mail.craswell.com","Content-Length":"4392"},"date":"978307200","messageID":"3.0.32.19961213151017.0091ed80@mail.craswell.com","receivedDate":"978307200","subject":"Encrypted message","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"blaker@craswell.com"},"extraHeaders":{"Return-Path":"<blaker@craswell.com>","Content-Type":"multipart\/signed; boundary=\u000a \"---=_=_ 659214770-385040-15143392 _=_=---\"; micalg=rsa-sha1; protocol=\u000a \"application\/x-pkcs7-signature\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Windows Eudora Pro Version 3.0 (32)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA19910\u000a          for <jwz@dredd.mcom.com>; Fri, 13 Dec 1996 15:00:10 -0800","X-Sender":"blaker@mail.craswell.com","Content-Length":"4392"},"date":"850518621","messageID":"3.0.32.19961213151017.0091ed80@mail.craswell.com","receivedDate":"850518621","subject":"Encrypted message","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/114 b/unittest/data/parser/output/mbox/jwz/114
index 5f79914c..9ea7692e 100644
--- a/unittest/data/parser/output/mbox/jwz/114
+++ b/unittest/data/parser/output/mbox/jwz/114
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Lisa Repka","mailbox":"repka@netscape.com"},"extraHeaders":{"Return-Path":"<repka@netscape.com>","Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 5.3 IP22)","Received":"from c3po.mcom.com ([205.217.237.46]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA14894\u000a          for <jwz@dredd.mcom.com>; Thu, 19 Dec 1996 09:38:52 -0800","Content-Length":"661","Organization":"Netscape Communications Corporation"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"repka@netscape.com"},"messageID":"32B97DAA.167E@netscape.com","receivedDate":"978307200","subject":"very cool","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Lisa Repka","mailbox":"repka@netscape.com"},"extraHeaders":{"Return-Path":"<repka@netscape.com>","Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 5.3 IP22)","Received":"from c3po.mcom.com ([205.217.237.46]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA14894\u000a          for <jwz@dredd.mcom.com>; Thu, 19 Dec 1996 09:38:52 -0800","Content-Length":"661","Organization":"Netscape Communications Corporation"},"date":"851017130","sender":{"class":"mailcore::Address","mailbox":"repka@netscape.com"},"messageID":"32B97DAA.167E@netscape.com","receivedDate":"851017130","subject":"very cool","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/116 b/unittest/data/parser/output/mbox/jwz/116
index 5a94b5e7..bb2ef72d 100644
--- a/unittest/data/parser/output/mbox/jwz/116
+++ b/unittest/data/parser/output/mbox/jwz/116
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"message\/rfc822; name=\"smime18-encrypted.msg\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","Content-Disposition":"inline; filename=\"smime18-encrypted.msg\"","Content-Transfer-Encoding":"7bit","X-Mailer":"Mozilla 3.01 (X11; U; IRIX 6.2 IP22)","Received":"from gruntle ([205.217.227.10]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA4040\u000a          for <jwz@netscape.com>; Fri, 7 Mar 1997 02:50:37 -0800","Content-Length":"2812","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"331FF2FF.FF6@netscape.com","receivedDate":"978307200","subject":"forwarded encrypted message","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"message\/rfc822; name=\"smime18-encrypted.msg\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","Content-Disposition":"inline; filename=\"smime18-encrypted.msg\"","Content-Transfer-Encoding":"7bit","X-Mailer":"Mozilla 3.01 (X11; U; IRIX 6.2 IP22)","Received":"from gruntle ([205.217.227.10]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA4040\u000a          for <jwz@netscape.com>; Fri, 7 Mar 1997 02:50:37 -0800","Content-Length":"2812","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"857731839","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"331FF2FF.FF6@netscape.com","receivedDate":"857731839","subject":"forwarded encrypted message","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/117 b/unittest/data/parser/output/mbox/jwz/117
index 73bf168e..7bdcad2a 100644
--- a/unittest/data/parser/output/mbox/jwz/117
+++ b/unittest/data/parser/output/mbox/jwz/117
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"multipart\/mixed; boundary=\"------------31DF237C2F1C\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.01 (X11; U; IRIX 6.2 IP22)","Received":"from gruntle ([205.217.227.10]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA4104\u000a          for <jwz@netscape.com>; Fri, 7 Mar 1997 02:51:05 -0800","Content-Length":"3188","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"331FF31B.ABD@netscape.com","receivedDate":"978307200","subject":"forwarded encrypted message (mult\/mixed)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Return-Path":"<jwz@netscape.com>","Content-Type":"multipart\/mixed; boundary=\"------------31DF237C2F1C\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.01 (X11; U; IRIX 6.2 IP22)","Received":"from gruntle ([205.217.227.10]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA4104\u000a          for <jwz@netscape.com>; Fri, 7 Mar 1997 02:51:05 -0800","Content-Length":"3188","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"857731867","sender":{"class":"mailcore::Address","mailbox":"jwz@netscape.com"},"messageID":"331FF31B.ABD@netscape.com","receivedDate":"857731867","subject":"forwarded encrypted message (mult\/mixed)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/118 b/unittest/data/parser/output/mbox/jwz/118
index e7a5dc4e..a2c9ee73 100644
--- a/unittest/data/parser/output/mbox/jwz/118
+++ b/unittest/data/parser/output/mbox/jwz/118
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Dan Hugo","mailbox":"dhugo@netscape.com"},"extraHeaders":{"Return-Path":"<dhugo@netscape.com>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=sha1; boundary=\"------------ms088B4AC60B9FCF022C11E60D\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.01 (X11; I; IRIX 5.3 IP22)","Received":"from ghoti ([207.1.147.41]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA8103\u000a          for <jwz@netscape.com>; Mon, 17 Mar 1997 17:17:40 -0800","Content-Length":"6011"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"dhugo@netscape.com"},"messageID":"332DED2F.F5365D61@netscape.com","receivedDate":"978307200","subject":"This is signed","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Dan Hugo","mailbox":"dhugo@netscape.com"},"extraHeaders":{"Return-Path":"<dhugo@netscape.com>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=sha1; boundary=\"------------ms088B4AC60B9FCF022C11E60D\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.01 (X11; I; IRIX 5.3 IP22)","Received":"from ghoti ([207.1.147.41]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA8103\u000a          for <jwz@netscape.com>; Mon, 17 Mar 1997 17:17:40 -0800","Content-Length":"6011"},"date":"858647855","sender":{"class":"mailcore::Address","mailbox":"dhugo@netscape.com"},"messageID":"332DED2F.F5365D61@netscape.com","receivedDate":"858647855","subject":"This is signed","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/119 b/unittest/data/parser/output/mbox/jwz/119
index fd76f50d..50ee6ee2 100644
--- a/unittest/data/parser/output/mbox/jwz/119
+++ b/unittest/data/parser/output/mbox/jwz/119
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},{"class":"mailcore::Address","displayName":"Dan Hugo","mailbox":"dhugo@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Lisa Repka","mailbox":"repka@netscape.com"},"extraHeaders":{"Return-Path":"<repka@netscape.com>","Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0005","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.01 (X11; I; IRIX 6.2 IP22)","Received":"from r2d2.mcom.com ([205.217.237.47]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA14844;\u000a          Sun, 23 Mar 1997 23:12:07 -0800","Content-Length":"10236","Organization":"Netscape Communications Corporation"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"repka@netscape.com"},"messageID":"3336293C.1A98A9A9@netscape.com","receivedDate":"978307200","subject":"testing out some new stuff","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},{"class":"mailcore::Address","displayName":"Dan Hugo","mailbox":"dhugo@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Lisa Repka","mailbox":"repka@netscape.com"},"extraHeaders":{"Return-Path":"<repka@netscape.com>","Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0005","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.01 (X11; I; IRIX 6.2 IP22)","Received":"from r2d2.mcom.com ([205.217.237.47]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA14844;\u000a          Sun, 23 Mar 1997 23:12:07 -0800","Content-Length":"10236","Organization":"Netscape Communications Corporation"},"date":"859187516","sender":{"class":"mailcore::Address","mailbox":"repka@netscape.com"},"messageID":"3336293C.1A98A9A9@netscape.com","receivedDate":"859187516","subject":"testing out some new stuff","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/12 b/unittest/data/parser/output/mbox/jwz/12
index 654db55f..584b9a67 100644
--- a/unittest/data/parser/output/mbox/jwz/12
+++ b/unittest/data/parser/output/mbox/jwz/12
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Dave Sincoskie","mailbox":"sincos"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_MdOmHZe0M2Yt8GzexjMdOmHZe0M2YtIGzf1R\"","MIME-Version":"1.0","Received":"from Messages.8.0.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Wed,  8 Jan 1992 11:21:00 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"371+1"},"date":"978307200","messageID":"wdOmHgu0M2Yt4Gzf9t@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: PS -- Re: mailer error","class":"mailcore::MessageHeader","inReplyTo":["9201062142.AA08914@raven.bellcore.com"],"references":["9201062142.AA08914@raven.bellcore.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Dave Sincoskie","mailbox":"sincos"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_MdOmHZe0M2Yt8GzexjMdOmHZe0M2YtIGzf1R\"","MIME-Version":"1.0","Received":"from Messages.8.0.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Wed,  8 Jan 1992 11:21:00 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"371+1"},"date":"694887660","messageID":"wdOmHgu0M2Yt4Gzf9t@thumper.bellcore.com","receivedDate":"694887660","subject":"Re: PS -- Re: mailer error","class":"mailcore::MessageHeader","inReplyTo":["9201062142.AA08914@raven.bellcore.com"],"references":["9201062142.AA08914@raven.bellcore.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/120 b/unittest/data/parser/output/mbox/jwz/120
index 7b4a5f2a..ee6e96a7 100644
--- a/unittest/data/parser/output/mbox/jwz/120
+++ b/unittest/data/parser/output/mbox/jwz/120
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"danw@ayce.com"},"extraHeaders":{"Return-Path":"<danw@ayce.com>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=sha1; boundary=\"------------ms1FB3ACBABA2E8DEE155566A8\"","MIME-Version":"1.0","X-Mozilla-Status":"0015","X-Mailer":"Mozilla 4.0b3 [en] (Win95; I)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA10068\u000a          for <jwz@dredd.mcom.com>; Tue, 15 Apr 1997 05:06:21 -0700","Content-Length":"2813","Organization":"ayce","X-Priority":"3 (Normal)"},"date":"978307200","messageID":"33536F24.BBDEA09D@ayce.com","receivedDate":"978307200","subject":"Re: Obtaining other people's certificates","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"danw@ayce.com"}]},"references":["33522A52.3AC8BA5A@ayce.com","3352D2BC.94342FC7@netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"danw@ayce.com"},"extraHeaders":{"Return-Path":"<danw@ayce.com>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=sha1; boundary=\"------------ms1FB3ACBABA2E8DEE155566A8\"","MIME-Version":"1.0","X-Mozilla-Status":"0015","X-Mailer":"Mozilla 4.0b3 [en] (Win95; I)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA10068\u000a          for <jwz@dredd.mcom.com>; Tue, 15 Apr 1997 05:06:21 -0700","Content-Length":"2813","Organization":"ayce","X-Priority":"3 (Normal)"},"date":"861105956","messageID":"33536F24.BBDEA09D@ayce.com","receivedDate":"861105956","subject":"Re: Obtaining other people's certificates","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"danw@ayce.com"}]},"references":["33522A52.3AC8BA5A@ayce.com","3352D2BC.94342FC7@netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/121 b/unittest/data/parser/output/mbox/jwz/121
index 21c71e58..7251ab0e 100644
--- a/unittest/data/parser/output/mbox/jwz/121
+++ b/unittest/data/parser/output/mbox/jwz/121
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.02 (X11; U; IRIX 6.2 IP22)","Content-Length":"523","Organization":"Netscape Communications Corporation, Mozilla Division","Content-Description":"S\/MIME Encrypted Message"},"date":"978307200","messageID":"33556759.E69CC032@netscape.com","receivedDate":"978307200","subject":"encrypted","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","contentDescription":"S\/MIME Encrypted Message","class":"mailcore::Attachment","filename":"smime.p7m"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.02 (X11; U; IRIX 6.2 IP22)","Content-Length":"523","Organization":"Netscape Communications Corporation, Mozilla Division","Content-Description":"S\/MIME Encrypted Message"},"date":"861235033","messageID":"33556759.E69CC032@netscape.com","receivedDate":"861235033","subject":"encrypted","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","contentDescription":"S\/MIME Encrypted Message","class":"mailcore::Attachment","filename":"smime.p7m"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/122 b/unittest/data/parser/output/mbox/jwz/122
index 91db1054..61a8d1bd 100644
--- a/unittest/data/parser/output/mbox/jwz/122
+++ b/unittest/data/parser/output/mbox/jwz/122
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bob Lord","mailbox":"lord@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jason Lawrence Weisberger","mailbox":"jweis@why.bother.com"},"extraHeaders":{"Content-ID":"<Pine.LNX.3.95.970417145937.5309Q@why.bother.com>","Return-Path":"<jweis@why.bother.com>","Content-Type":"MULTIPART\/SIGNED; PROTOCOL=\"application\/x-pkcs7-signature\"; MICALG=sha1; BOUNDARY=------------ms2B7C383EE860EA977E7C30B4","MIME-Version":"1.0","X-Status":"","X-UID":"2572","Received":"from maleman.mcom.com ([198.93.92.3]) by judge.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA22528\u000a          for <lord@judge.mcom.com>; Thu, 17 Apr 1997 16:05:58 -0700","X-IMAP-Date":"17-Apr-1997 16:05:58 +0000"},"date":"978307200","messageID":"Pine.LNX.3.95.970417145937.5309P-100000@why.bother.com","receivedDate":"978307200","subject":"Re: Hey!","class":"mailcore::MessageHeader","inReplyTo":["3356A902.3F89787@netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bob Lord","mailbox":"lord@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jason Lawrence Weisberger","mailbox":"jweis@why.bother.com"},"extraHeaders":{"Content-ID":"<Pine.LNX.3.95.970417145937.5309Q@why.bother.com>","Return-Path":"<jweis@why.bother.com>","Content-Type":"MULTIPART\/SIGNED; PROTOCOL=\"application\/x-pkcs7-signature\"; MICALG=sha1; BOUNDARY=------------ms2B7C383EE860EA977E7C30B4","MIME-Version":"1.0","X-Status":"","X-UID":"2572","Received":"from maleman.mcom.com ([198.93.92.3]) by judge.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA22528\u000a          for <lord@judge.mcom.com>; Thu, 17 Apr 1997 16:05:58 -0700","X-IMAP-Date":"17-Apr-1997 16:05:58 +0000"},"date":"861314624","messageID":"Pine.LNX.3.95.970417145937.5309P-100000@why.bother.com","receivedDate":"861314624","subject":"Re: Hey!","class":"mailcore::MessageHeader","inReplyTo":["3356A902.3F89787@netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/123 b/unittest/data/parser/output/mbox/jwz/123
index d29ac139..a889586b 100644
--- a/unittest/data/parser/output/mbox/jwz/123
+++ b/unittest/data/parser/output/mbox/jwz/123
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bob Lord","mailbox":"lord@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jason Lawrence Weisberger","mailbox":"jweis@why.bother.com"},"extraHeaders":{"Content-ID":"<Pine.LNX.3.95.970512224621.25674U@why.bother.com>","Return-Path":"<jweis@why.bother.com>","Content-Type":"MULTIPART\/SIGNED; PROTOCOL=\"application\/x-pkcs7-signature\"; MICALG=sha1; BOUNDARY=------------ms7014A498B2DAEA7AB832BC0A","MIME-Version":"1.0","X-Status":"","X-UID":"5624","Received":"from maleman.mcom.com ([198.93.92.3]) by judge.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA18232\u000a          for <lord@judge.mcom.com>; Mon, 12 May 1997 23:43:52 -0700","X-IMAP-Date":"12-May-1997 23:43:53 +0000"},"date":"978307200","messageID":"Pine.LNX.3.95.970512224621.25674T-311000@why.bother.com","receivedDate":"978307200","subject":"Re: [Fwd: the one true mail client?]","class":"mailcore::MessageHeader","inReplyTo":["3377D934.E7717CD0@netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"Pine.LNX.3.95.970512224621.25674W@why.bother.com","partType":"single","uniqueID":"2","mimeType":"text\/PLAIN","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"lord@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"friedman@netscape.com"},"extraHeaders":{"Return-Path":"<friedman@netscape.com>","X-Status":"","X-UID":"5585","Received":"from netscape.com ([205.217.237.47]) by judge.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA16893\u000a          for <lord@judge.mcom.com>; Mon, 12 May 1997 18:52:24 -0700","X-IMAP-Date":"12-May-1997 18:52:24 +0000"},"date":"978307200","messageID":"199705130152.SAA20422@oink.mcom.com","receivedDate":"978307200","subject":"Re: the one true mail client?","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"friedman@netscape.com"}]},"inReplyTo":["lord@netscape.com"],"references":["33650DE6.143C8A9C@netscape.com","337747C1.2C4EB494@netscape.com","337749C1.EDC1403E@netscape.com","33779383.F9C729DB@netscape.com","3377C898.98133783@netscape.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"4","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"contentID":"Pine.LNX.3.95.970512224621.25674Y@why.bother.com","partType":"single","uniqueID":"3","mimeType":"text\/X-VCARD","charset":"us-ascii","contentDescription":"Card for Bob Lord","class":"mailcore::Attachment","filename":"vcard.vcf"}]}},{"contentID":"Pine.LNX.3.95.970512224621.25674Z@why.bother.com","partType":"single","uniqueID":"1","mimeType":"application\/X-PKCS7-SIGNATURE","contentDescription":"S\/MIME Cryptographic Signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bob Lord","mailbox":"lord@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jason Lawrence Weisberger","mailbox":"jweis@why.bother.com"},"extraHeaders":{"Content-ID":"<Pine.LNX.3.95.970512224621.25674U@why.bother.com>","Return-Path":"<jweis@why.bother.com>","Content-Type":"MULTIPART\/SIGNED; PROTOCOL=\"application\/x-pkcs7-signature\"; MICALG=sha1; BOUNDARY=------------ms7014A498B2DAEA7AB832BC0A","MIME-Version":"1.0","X-Status":"","X-UID":"5624","Received":"from maleman.mcom.com ([198.93.92.3]) by judge.mcom.com\u000a          (Netscape Mail Server v2.02) with SMTP id AAA18232\u000a          for <lord@judge.mcom.com>; Mon, 12 May 1997 23:43:52 -0700","X-IMAP-Date":"12-May-1997 23:43:53 +0000"},"date":"863502405","messageID":"Pine.LNX.3.95.970512224621.25674T-311000@why.bother.com","receivedDate":"863502405","subject":"Re: [Fwd: the one true mail client?]","class":"mailcore::MessageHeader","inReplyTo":["3377D934.E7717CD0@netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"Pine.LNX.3.95.970512224621.25674W@why.bother.com","partType":"single","uniqueID":"2","mimeType":"text\/PLAIN","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"lord@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"friedman@netscape.com"},"extraHeaders":{"Return-Path":"<friedman@netscape.com>","X-Status":"","X-UID":"5585","Received":"from netscape.com ([205.217.237.47]) by judge.mcom.com\u000a          (Netscape Mail Server v2.02) with ESMTP id AAA16893\u000a          for <lord@judge.mcom.com>; Mon, 12 May 1997 18:52:24 -0700","X-IMAP-Date":"12-May-1997 18:52:24 +0000"},"date":"863488342","messageID":"199705130152.SAA20422@oink.mcom.com","receivedDate":"863488342","subject":"Re: the one true mail client?","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"friedman@netscape.com"}]},"inReplyTo":["lord@netscape.com"],"references":["33650DE6.143C8A9C@netscape.com","337747C1.2C4EB494@netscape.com","337749C1.EDC1403E@netscape.com","33779383.F9C729DB@netscape.com","3377C898.98133783@netscape.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"4","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"contentID":"Pine.LNX.3.95.970512224621.25674Y@why.bother.com","partType":"single","uniqueID":"3","mimeType":"text\/X-VCARD","charset":"us-ascii","contentDescription":"Card for Bob Lord","class":"mailcore::Attachment","filename":"vcard.vcf"}]}},{"contentID":"Pine.LNX.3.95.970512224621.25674Z@why.bother.com","partType":"single","uniqueID":"1","mimeType":"application\/X-PKCS7-SIGNATURE","contentDescription":"S\/MIME Cryptographic Signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/124 b/unittest/data/parser/output/mbox/jwz/124
index 548b20c6..cf5320f2 100644
--- a/unittest/data/parser/output/mbox/jwz/124
+++ b/unittest/data/parser/output/mbox/jwz/124
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'smime-dev@rsa.com'","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"BlakeR@deming.com"},"extraHeaders":{"Return-Path":"BlakeR@deming.com","Content-Type":"application\/x-pkcs7-mime; name=\"deming.p7m\"","X-Mozilla-Status":"0005","Content-Transfer-Encoding":"base64","X-Mailer":"Microsoft Exchange Server Internet Mail Connector Version 4.0.838.14","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id BAA29432; Sat, 27 Apr 1996 01:15:23 -0700","Mime-Version":"1.0","Content-Length":"2882"},"date":"978307200","messageID":"c=US%a=_%p=Deming_Software%l=PAIN-960427080858Z-10@pain.deming.com","receivedDate":"978307200","subject":"Deming Software -- ready to go!","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"deming.p7m"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'smime-dev@rsa.com'","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"BlakeR@deming.com"},"extraHeaders":{"Return-Path":"BlakeR@deming.com","Content-Type":"application\/x-pkcs7-mime; name=\"deming.p7m\"","X-Mozilla-Status":"0005","Content-Transfer-Encoding":"base64","X-Mailer":"Microsoft Exchange Server Internet Mail Connector Version 4.0.838.14","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id BAA29432; Sat, 27 Apr 1996 01:15:23 -0700","Mime-Version":"1.0","Content-Length":"2882"},"date":"830592538","messageID":"c=US%a=_%p=Deming_Software%l=PAIN-960427080858Z-10@pain.deming.com","receivedDate":"830592538","subject":"Deming Software -- ready to go!","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"deming.p7m"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/125 b/unittest/data/parser/output/mbox/jwz/125
index 3efef3e6..c7dbb560 100644
--- a/unittest/data/parser/output/mbox/jwz/125
+++ b/unittest/data/parser/output/mbox/jwz/125
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","mailbox":"Ray2@FrontierTech.com"},"extraHeaders":{"Return-Path":"ray2@FrontierTech.com","Content-Type":"Application\/x-pkcs7-mime","Status":"U","X-Mozilla-Status":"0001","X-UIDL":"833305231.000","Content-Transfer-Encoding":"Base64","X-Mailer":"SuperTCP Suite for Windows Version 2.1 (Mailer Version 1.02)","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id KAA06913; Tue, 28 May 1996 10:39:26 -0700","Mime-Version":"1.0","Content-Length":"2122"},"date":"978307200","messageID":"31AB36CC-00000001@rock106.FrontierTech.com","receivedDate":"978307200","subject":"Frontier Technologies testing, here's my cert","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","mailbox":"Ray2@FrontierTech.com"},"extraHeaders":{"Return-Path":"ray2@FrontierTech.com","Content-Type":"Application\/x-pkcs7-mime","Status":"U","X-Mozilla-Status":"0001","X-UIDL":"833305231.000","Content-Transfer-Encoding":"Base64","X-Mailer":"SuperTCP Suite for Windows Version 2.1 (Mailer Version 1.02)","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id KAA06913; Tue, 28 May 1996 10:39:26 -0700","Mime-Version":"1.0","Content-Length":"2122"},"date":"833286263","messageID":"31AB36CC-00000001@rock106.FrontierTech.com","receivedDate":"833286263","subject":"Frontier Technologies testing, here's my cert","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/126 b/unittest/data/parser/output/mbox/jwz/126
index 8f550d0c..7cb90b80 100644
--- a/unittest/data/parser/output/mbox/jwz/126
+++ b/unittest/data/parser/output/mbox/jwz/126
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","mailbox":"jgildred@opensoft.com"},"extraHeaders":{"Return-Path":"owner-smime-dev@RSA.COM","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=rsa-md5; boundary=\"===OpenSoft===11339510===2===\"","Status":"U","X-Mozilla-Status":"0005","X-UIDL":"834432008.000","X-Mailer":"OpenSoft ExpressMail Version 1.0","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id LAA06225; Mon, 10 Jun 1996 11:39:15 -0700","Mime-Version":"1.0","Content-Length":"2957","Precedence":"bulk"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"9606101835.AA29051@www","receivedDate":"978307200","subject":"Signed Confirmation","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","mailbox":"jgildred@opensoft.com"},"extraHeaders":{"Return-Path":"owner-smime-dev@RSA.COM","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=rsa-md5; boundary=\"===OpenSoft===11339510===2===\"","Status":"U","X-Mozilla-Status":"0005","X-UIDL":"834432008.000","X-Mailer":"OpenSoft ExpressMail Version 1.0","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id LAA06225; Mon, 10 Jun 1996 11:39:15 -0700","Mime-Version":"1.0","Content-Length":"2957","Precedence":"bulk"},"date":"834435472","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"9606101835.AA29051@www","receivedDate":"834435472","subject":"Signed Confirmation","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/127 b/unittest/data/parser/output/mbox/jwz/127
index f04508bb..662670dd 100644
--- a/unittest/data/parser/output/mbox/jwz/127
+++ b/unittest/data/parser/output/mbox/jwz/127
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'smime-dev@rsa.com'","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Peter Williams","mailbox":"peter@verisign.com"},"extraHeaders":{"Return-Path":"owner-smime-dev@RSA.COM","Content-Type":"multipart\/mixed; boundary=\"---- =_NextPart_000_01BB9E4D.CA434FE0\"","X-Mozilla-Status":"0001","X-UIDL":"db360888b99be53e578173dc6a65a828","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.mcom.com (8.7.5\/8.7.3) with SMTP id NAA01603; Mon, 9 Sep 1996 13:04:54 -0700 (PDT)","Mime-Version":"1.0","Content-Length":"2880","Precedence":"bulk"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"01BB9E4D.CA27D8A0@Peter.verisign.com","receivedDate":"978307200","subject":"plase help by returning what gets delivered...","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"text\/html","class":"mailcore::Attachment","filename":"Page1.htm"},{"partType":"single","uniqueID":"2","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"Page1.p7s"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'smime-dev@rsa.com'","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Peter Williams","mailbox":"peter@verisign.com"},"extraHeaders":{"Return-Path":"owner-smime-dev@RSA.COM","Content-Type":"multipart\/mixed; boundary=\"---- =_NextPart_000_01BB9E4D.CA434FE0\"","X-Mozilla-Status":"0001","X-UIDL":"db360888b99be53e578173dc6a65a828","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.mcom.com (8.7.5\/8.7.3) with SMTP id NAA01603; Mon, 9 Sep 1996 13:04:54 -0700 (PDT)","Mime-Version":"1.0","Content-Length":"2880","Precedence":"bulk"},"date":"842298758","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"01BB9E4D.CA27D8A0@Peter.verisign.com","receivedDate":"842298758","subject":"plase help by returning what gets delivered...","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"text\/html","class":"mailcore::Attachment","filename":"Page1.htm"},{"partType":"single","uniqueID":"2","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"Page1.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/129 b/unittest/data/parser/output/mbox/jwz/129
index d287a6c8..b68fe6b8 100644
--- a/unittest/data/parser/output/mbox/jwz/129
+++ b/unittest/data/parser/output/mbox/jwz/129
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"alex@verisign.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"},{"class":"mailcore::Address","mailbox":"smime-editor@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"blaker@craswell.com"},"extraHeaders":{"Content-Type":"multipart\/signed; boundary=\u000a \"---=_=_ 10156253-385044-15062624 _=_=---\"; micalg=rsa-sha1; protocol=\u000a \"application\/x-pkcs7-signature\"","X-Mailer":"Windows Eudora Pro Version 3.0b33 (32)","Mime-Version":"1.0","X-Sender":"blaker@mail.craswell.com","Precedence":"bulk"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"3.0b33.32.19961007212705.0091cdb0@mail.craswell.com","receivedDate":"978307200","subject":"A cert from deming software","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"alex@verisign.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"},{"class":"mailcore::Address","mailbox":"smime-editor@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Blake Ramsdell","mailbox":"blaker@craswell.com"},"extraHeaders":{"Content-Type":"multipart\/signed; boundary=\u000a \"---=_=_ 10156253-385044-15062624 _=_=---\"; micalg=rsa-sha1; protocol=\u000a \"application\/x-pkcs7-signature\"","X-Mailer":"Windows Eudora Pro Version 3.0b33 (32)","Mime-Version":"1.0","X-Sender":"blaker@mail.craswell.com","Precedence":"bulk"},"date":"844748829","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"3.0b33.32.19961007212705.0091cdb0@mail.craswell.com","receivedDate":"844748829","subject":"A cert from deming software","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment","filename":"smime.p7s"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/130 b/unittest/data/parser/output/mbox/jwz/130
index f7aa5d83..04a83720 100644
--- a/unittest/data/parser/output/mbox/jwz/130
+++ b/unittest/data/parser/output/mbox/jwz/130
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'set-discuss@commerce.net'","mailbox":"set-discuss@commerce.net"},{"class":"mailcore::Address","displayName":"'smime-dev@rsa.com'","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Kurt Stammberger","mailbox":"kurt@RSA.COM"},"extraHeaders":{"Return-Path":"owner-smime-dev@RSA.COM","Content-Type":"multipart\/mixed; boundary=\"---- =_NextPart_000_01BBBCFC.5826AA10\"","X-Mozilla-Status":"0005","X-UIDL":"4f6d764354ec3f5fa6e9ac0c33439a8c","X-Mailer":"Microsoft Exchange Server Internet Mail Connector Version 4.0.993.5","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.mcom.com (8.7.5\/8.7.3) with SMTP id OAA13788; Fri, 18 Oct 1996 14:03:45 -0700 (PDT)","Mime-Version":"1.0","Precedence":"bulk"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"c=US%a=_%p=RSA_Data_Securit%l=LOBESTER-961018205746Z-5325@LOBESTER.rsa.com","receivedDate":"978307200","subject":"S\/MIME Cert","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"verisign.p7m"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'set-discuss@commerce.net'","mailbox":"set-discuss@commerce.net"},{"class":"mailcore::Address","displayName":"'smime-dev@rsa.com'","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","displayName":"Kurt Stammberger","mailbox":"kurt@RSA.COM"},"extraHeaders":{"Return-Path":"owner-smime-dev@RSA.COM","Content-Type":"multipart\/mixed; boundary=\"---- =_NextPart_000_01BBBCFC.5826AA10\"","X-Mozilla-Status":"0005","X-UIDL":"4f6d764354ec3f5fa6e9ac0c33439a8c","X-Mailer":"Microsoft Exchange Server Internet Mail Connector Version 4.0.993.5","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.mcom.com (8.7.5\/8.7.3) with SMTP id OAA13788; Fri, 18 Oct 1996 14:03:45 -0700 (PDT)","Mime-Version":"1.0","Precedence":"bulk"},"date":"845672266","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"c=US%a=_%p=RSA_Data_Securit%l=LOBESTER-961018205746Z-5325@LOBESTER.rsa.com","receivedDate":"845672266","subject":"S\/MIME Cert","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"verisign.p7m"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/131 b/unittest/data/parser/output/mbox/jwz/131
index c909e016..4f79d4d2 100644
--- a/unittest/data/parser/output/mbox/jwz/131
+++ b/unittest/data/parser/output/mbox/jwz/131
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","mailbox":"jgildred@opensoft.com"},"extraHeaders":{"Return-Path":"<owner-smime-dev@RSA.COM>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=rsa-sha; boundary=\"===OpenSoft===247233737===5===\"","X-Mozilla-Status":"0001","X-Mailer":"OpenSoft ExpressMail Version 1.0","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.01) with SMTP id AAA20354;\u000a          Tue, 29 Oct 1996 12:15:27 -0700","Mime-Version":"1.0","Content-Length":"4051","Precedence":"bulk"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"MSG961029151201#15@server1.opensoft.com","receivedDate":"978307200","subject":"Signed SHA1 with VeriSign certification","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"smime-dev@RSA.COM"}]},"from":{"class":"mailcore::Address","mailbox":"jgildred@opensoft.com"},"extraHeaders":{"Return-Path":"<owner-smime-dev@RSA.COM>","Content-Type":"multipart\/signed; protocol=\"application\/x-pkcs7-signature\"; micalg=rsa-sha; boundary=\"===OpenSoft===247233737===5===\"","X-Mozilla-Status":"0001","X-Mailer":"OpenSoft ExpressMail Version 1.0","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Mail Server v2.01) with SMTP id AAA20354;\u000a          Tue, 29 Oct 1996 12:15:27 -0700","Mime-Version":"1.0","Content-Length":"4051","Precedence":"bulk"},"date":"846619920","sender":{"class":"mailcore::Address","mailbox":"owner-smime-dev@RSA.COM"},"messageID":"MSG961029151201#15@server1.opensoft.com","receivedDate":"846619920","subject":"Signed SHA1 with VeriSign certification","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/x-pkcs7-signature","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/132 b/unittest/data/parser/output/mbox/jwz/132
index 1df1f6d2..7bfee468 100644
--- a/unittest/data/parser/output/mbox/jwz/132
+++ b/unittest/data/parser/output/mbox/jwz/132
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"The Postmaster","mailbox":"postmaster@mm1.sprynet.com"}]},"to":{"class":"mailcore::Array","items":[]},"from":{"class":"mailcore::Address","displayName":"The Post Office","mailbox":"postmaster@mm1.sprynet.com"},"extraHeaders":{"Content-Type":"multipart\/report; report-type=delivery-status;","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-UIDL":"ee2855c88ed795f63bbcbfd279c80fab","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.7.5\/8.7.3) with SMTP id CAA25028 for <jwz@urchin.mcom.com>; Mon, 29 Jul 1996 02:26:08 -0700 (PDT)","Content-Length":"1263","Precedence":"junk"},"date":"978307200","messageID":"96Jul29.022158-0700pdt.148226-12799+708@mm1.sprynet.com","receivedDate":"978307200","subject":"email delivery error","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"multipart\/report","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"The Postmaster","mailbox":"postmaster@mm1.sprynet.com"}]},"to":{"class":"mailcore::Array","items":[]},"from":{"class":"mailcore::Address","displayName":"The Post Office","mailbox":"postmaster@mm1.sprynet.com"},"extraHeaders":{"Content-Type":"multipart\/report; report-type=delivery-status;","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-UIDL":"ee2855c88ed795f63bbcbfd279c80fab","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.7.5\/8.7.3) with SMTP id CAA25028 for <jwz@urchin.mcom.com>; Mon, 29 Jul 1996 02:26:08 -0700 (PDT)","Content-Length":"1263","Precedence":"junk"},"date":"838631588","messageID":"96Jul29.022158-0700pdt.148226-12799+708@mm1.sprynet.com","receivedDate":"838631588","subject":"email delivery error","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"multipart\/report","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/133 b/unittest/data/parser/output/mbox/jwz/133
index 0a986bbd..09e92776 100644
--- a/unittest/data/parser/output/mbox/jwz/133
+++ b/unittest/data/parser/output/mbox/jwz/133
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"tro@partech.com"},"extraHeaders":{"Newsgroups":"mcom.dev.client.x_bug","Organization":"Local Mail\/News Gateway"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"Jumbo Bug Report","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"tro@partech.com"},"extraHeaders":{"Newsgroups":"mcom.dev.client.x_bug","Organization":"Local Mail\/News Gateway"},"date":"799107257","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"799107257","subject":"Jumbo Bug Report","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/134 b/unittest/data/parser/output/mbox/jwz/134
index 3b4712fe..e25b5c81 100644
--- a/unittest/data/parser/output/mbox/jwz/134
+++ b/unittest/data/parser/output/mbox/jwz/134
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"tro@partech.com"},"extraHeaders":{"Content-Type":"x-sun-attachment","Newsgroups":"mcom.dev.client.x_bug"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"Jumbo Bug Report","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"x-sun-attachment\/unknown","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"tro@partech.com"},"extraHeaders":{"Content-Type":"x-sun-attachment","Newsgroups":"mcom.dev.client.x_bug"},"date":"799107257","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"799107257","subject":"Jumbo Bug Report","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"x-sun-attachment\/unknown","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/135 b/unittest/data/parser/output/mbox/jwz/135
index ea0e5c33..8fce1384 100644
--- a/unittest/data/parser/output/mbox/jwz/135
+++ b/unittest/data/parser/output/mbox/jwz/135
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jean-Philippe Favreau","mailbox":"favreau@APM2.NCSL.NIST.GOV"},"extraHeaders":{"Content-Type":"X-sun-attachment","Lines":"38","Newsgroups":"bit.listserv.edi-l","Comments":"Gated by NETNEWS@AUVM.AMERICAN.EDU","Path":"flop.mcom.com!news.Stanford.EDU!lll-winken.llnl.gov!news.larc.nasa.gov!news.msfc.nasa.gov!bcm!convex!news.duke.edu!news-feed-1.peachnet.edu!news.Gsu.EDU!gatech!paladin.american.edu!auvm!APM2.NCSL.NIST.GOV!favreau"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"Electronic Data Interchange Issues","mailbox":"EDI-L@UCCVMA.UCOP.EDU"},"messageID":"9504261902.AA20642@apm2.ncsl.nist.gov","receivedDate":"978307200","subject":"Federal EDI - 836 IC open for comments","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"X-sun-attachment\/unknown","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jean-Philippe Favreau","mailbox":"favreau@APM2.NCSL.NIST.GOV"},"extraHeaders":{"Content-Type":"X-sun-attachment","Lines":"38","Newsgroups":"bit.listserv.edi-l","Comments":"Gated by NETNEWS@AUVM.AMERICAN.EDU","Path":"flop.mcom.com!news.Stanford.EDU!lll-winken.llnl.gov!news.larc.nasa.gov!news.msfc.nasa.gov!bcm!convex!news.duke.edu!news-feed-1.peachnet.edu!news.Gsu.EDU!gatech!paladin.american.edu!auvm!APM2.NCSL.NIST.GOV!favreau"},"date":"798922936","sender":{"class":"mailcore::Address","displayName":"Electronic Data Interchange Issues","mailbox":"EDI-L@UCCVMA.UCOP.EDU"},"messageID":"9504261902.AA20642@apm2.ncsl.nist.gov","receivedDate":"798922936","subject":"Federal EDI - 836 IC open for comments","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"X-sun-attachment\/unknown","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/136 b/unittest/data/parser/output/mbox/jwz/136
index f4f3db72..008ee879 100644
--- a/unittest/data/parser/output/mbox/jwz/136
+++ b/unittest/data/parser/output/mbox/jwz/136
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"MRC@CAC.Washington.EDU"},"extraHeaders":{"Return-Path":"<MRC@CAC.Washington.EDU>","Content-Type":"MULTIPART\/mixed;boundary=\"16819560-1953210302-686813225:#25434\"","MIME-Version":"RFC-XXXX","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA10504> for nsb; Mon, 7 Oct 91 01:27:34 EDT"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@Tomobiki-Cho.CAC.Washington.EDU"},"messageID":"MailManager.686813059.25434.mrc@Tomobiki-Cho.CAC.Washington.EDU","receivedDate":"978307200","subject":"re: audio mail","class":"mailcore::MessageHeader","inReplyTo":["9110032002.AA08943@greenbush.bellcore.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"audio\/basic","contentDescription":"voice mail","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"MRC@CAC.Washington.EDU"},"extraHeaders":{"Return-Path":"<MRC@CAC.Washington.EDU>","Content-Type":"MULTIPART\/mixed;boundary=\"16819560-1953210302-686813225:#25434\"","MIME-Version":"RFC-XXXX","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA10504> for nsb; Mon, 7 Oct 91 01:27:34 EDT"},"date":"686813059","sender":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@Tomobiki-Cho.CAC.Washington.EDU"},"messageID":"MailManager.686813059.25434.mrc@Tomobiki-Cho.CAC.Washington.EDU","receivedDate":"686813059","subject":"re: audio mail","class":"mailcore::MessageHeader","inReplyTo":["9110032002.AA08943@greenbush.bellcore.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"audio\/basic","contentDescription":"voice mail","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/139 b/unittest/data/parser/output/mbox/jwz/139
index f3e085bf..01e8da2c 100644
--- a/unittest/data/parser/output/mbox/jwz/139
+++ b/unittest/data/parser/output/mbox/jwz/139
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@Tomobiki-Cho.CAC.Washington.EDU"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.ce1ICbq0M2YtM1U0gA\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Mon,  4 May 1992 10:01:12 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"171+3"},"date":"978307200","messageID":"Ie1ICcG0M2Yt01U0or@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: MIME: Some real world FACTS of life","class":"mailcore::MessageHeader","inReplyTo":["MS-C.704934000.1103527590.mrc@Tomobiki-Cho.CAC.Washington.EDU"],"references":["MS-C.704934000.1103527590.mrc@Tomobiki-Cho.CAC.Washington.EDU"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"audio\/basic","contentDescription":"Danger, danger!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"illogical","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"audio\/basic","contentDescription":"Does not compute!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@Tomobiki-Cho.CAC.Washington.EDU"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.ce1ICbq0M2YtM1U0gA\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Mon,  4 May 1992 10:01:12 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"171+3"},"date":"704988072","messageID":"Ie1ICcG0M2Yt01U0or@thumper.bellcore.com","receivedDate":"704988072","subject":"Re: MIME: Some real world FACTS of life","class":"mailcore::MessageHeader","inReplyTo":["MS-C.704934000.1103527590.mrc@Tomobiki-Cho.CAC.Washington.EDU"],"references":["MS-C.704934000.1103527590.mrc@Tomobiki-Cho.CAC.Washington.EDU"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"audio\/basic","contentDescription":"Danger, danger!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"illogical","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"audio\/basic","contentDescription":"Does not compute!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/141 b/unittest/data/parser/output/mbox/jwz/141
index 4e136cf9..1fef8cdd 100644
--- a/unittest/data/parser/output/mbox/jwz/141
+++ b/unittest/data/parser/output/mbox/jwz/141
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"date":"978307200","messageID":"31C105ED.41C6adfas@netscape.com","receivedDate":"978307200","subject":"uuencoded images","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"date":"834733549","messageID":"31C105ED.41C6adfas@netscape.com","receivedDate":"834733549","subject":"uuencoded images","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/142 b/unittest/data/parser/output/mbox/jwz/142
index 66ecaaf1..81df5c6d 100644
--- a/unittest/data/parser/output/mbox/jwz/142
+++ b/unittest/data/parser/output/mbox/jwz/142
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mhtml@SEGATE.SUNET.SE"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"lewisg@Exchange.Microsoft.com"}]},"from":{"class":"mailcore::Address","mailbox":"izzy@nugget.scr.atm.com"},"extraHeaders":{"Return-Path":"owner-mhtml@SEGATE.SUNET.SE","Content-Type":"multipart\/mixed;\u000a              boundary=\"=_27tW56g.bO1996u.N16d000A.r09Y.36:0008d3\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","X-UIDL":"9f218600f41793d7a03f4710763907fb","Content-Transfer-Encoding":"7bit","X-Mailer":"Emissary V2.03, by Attachmate Corp.","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.mcom.com (8.7.5\/8.7.3) with SMTP id JAA29055 for <jwz@urchin.mcom.com>; Fri, 27 Sep 1996 09:44:42 -0700 (PDT)","Content-Length":"4879"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"owner-mhtml@SEGATE.SUNET.SE"},"messageID":"19960927163654.izzy@scr.atm.com","receivedDate":"978307200","subject":"RE: problem with relative urls and applets","class":"mailcore::MessageHeader","inReplyTo":["MHTML%96092703403599@SEGATE.SUNET.SE"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/vcard","inlineAttachment":"1","contentDescription":"The Sender's Signature","class":"mailcore::Attachment","filename":"MJOSEPH.VCF"}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mhtml@SEGATE.SUNET.SE"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"lewisg@Exchange.Microsoft.com"}]},"from":{"class":"mailcore::Address","mailbox":"izzy@nugget.scr.atm.com"},"extraHeaders":{"Return-Path":"owner-mhtml@SEGATE.SUNET.SE","Content-Type":"multipart\/mixed;\u000a              boundary=\"=_27tW56g.bO1996u.N16d000A.r09Y.36:0008d3\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","X-UIDL":"9f218600f41793d7a03f4710763907fb","Content-Transfer-Encoding":"7bit","X-Mailer":"Emissary V2.03, by Attachmate Corp.","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.mcom.com (8.7.5\/8.7.3) with SMTP id JAA29055 for <jwz@urchin.mcom.com>; Fri, 27 Sep 1996 09:44:42 -0700 (PDT)","Content-Length":"4879"},"date":"843842214","sender":{"class":"mailcore::Address","mailbox":"owner-mhtml@SEGATE.SUNET.SE"},"messageID":"19960927163654.izzy@scr.atm.com","receivedDate":"843842214","subject":"RE: problem with relative urls and applets","class":"mailcore::MessageHeader","inReplyTo":["MHTML%96092703403599@SEGATE.SUNET.SE"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/vcard","inlineAttachment":"1","contentDescription":"The Sender's Signature","class":"mailcore::Attachment","filename":"MJOSEPH.VCF"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/143 b/unittest/data/parser/output/mbox/jwz/143
index 977aac62..6bae03a9 100644
--- a/unittest/data/parser/output/mbox/jwz/143
+++ b/unittest/data/parser/output/mbox/jwz/143
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","mailbox":"bob@cs.su.oz.au"},"extraHeaders":{"Return-Path":"<bob@sarad.cs.su.oz.au>","Content-Type":"multipart\/mixed; boundary=qwertyuiop123","MIME-Version":"RFC-XXXX","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA03048> for nsb; Sat, 7 Dec 91 17:15:29 EST"},"date":"978307200","messageID":"9112072214.AA26057@thumper.bellcore.com","receivedDate":"978307200","subject":"RFC-XXXX","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"image\/pgm","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","mailbox":"bob@cs.su.oz.au"},"extraHeaders":{"Return-Path":"<bob@sarad.cs.su.oz.au>","Content-Type":"multipart\/mixed; boundary=qwertyuiop123","MIME-Version":"RFC-XXXX","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA03048> for nsb; Sat, 7 Dec 91 17:15:29 EST"},"date":"692183460","messageID":"9112072214.AA26057@thumper.bellcore.com","receivedDate":"692183460","subject":"RFC-XXXX","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"image\/pgm","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/144 b/unittest/data/parser/output/mbox/jwz/144
index 3d5cc6e7..48df50d0 100644
--- a/unittest/data/parser/output/mbox/jwz/144
+++ b/unittest/data/parser/output/mbox/jwz/144
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"}]},"from":{"class":"mailcore::Address","displayName":"Darren New","mailbox":"dnew"},"extraHeaders":{"Return-Path":"<dnew>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.keAvi9O0M2U=AU4XRw\"","Received":"from nevada.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA22702> for nsb; Mon, 8 Jun 92 15:57:08 EDT","Mime-Version":"1.0","X-Andrew-Message-Size":"8538+4"},"date":"978307200","messageID":"0eAvi=C0M2U=0U4XZI@thumper.bellcore.com","receivedDate":"978307200","subject":"Fwd: revised MIME architecture","class":"mailcore::MessageHeader","references":["9206062231.AA23867@pixel.convex.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"message\/external-body","contentDescription":"Object of type 'message\/external-body;","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"text\/SGML","contentDescription":"Object of type 'text\/SGML","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"message\/external-body","contentDescription":"Object of type 'message\/external-body","class":"mailcore::Attachment","filename":"\/hypertext\/WWW\/TheProject.html"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/gif","contentDescription":"Object of type 'image\/gif","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"}]},"from":{"class":"mailcore::Address","displayName":"Darren New","mailbox":"dnew"},"extraHeaders":{"Return-Path":"<dnew>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.keAvi9O0M2U=AU4XRw\"","Received":"from nevada.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA22702> for nsb; Mon, 8 Jun 92 15:57:08 EDT","Mime-Version":"1.0","X-Andrew-Message-Size":"8538+4"},"date":"708033419","messageID":"0eAvi=C0M2U=0U4XZI@thumper.bellcore.com","receivedDate":"708033419","subject":"Fwd: revised MIME architecture","class":"mailcore::MessageHeader","references":["9206062231.AA23867@pixel.convex.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"message\/external-body","contentDescription":"Object of type 'message\/external-body;","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"text\/SGML","contentDescription":"Object of type 'text\/SGML","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"message\/external-body","contentDescription":"Object of type 'message\/external-body","class":"mailcore::Attachment","filename":"\/hypertext\/WWW\/TheProject.html"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/gif","contentDescription":"Object of type 'image\/gif","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/146 b/unittest/data/parser/output/mbox/jwz/146
index 3d82563a..8b17fb96 100644
--- a/unittest/data/parser/output/mbox/jwz/146
+++ b/unittest/data/parser/output/mbox/jwz/146
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Laurie Anna Edlund (Kaplan)","mailbox":"lakaplan@microsoft.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'html-erb@w3.org'","mailbox":"html-erb@w3.org"}]},"from":{"class":"mailcore::Address","displayName":"Scott Isaacs","mailbox":"scotti@microsoft.com"},"extraHeaders":{"X-Mailing-List":"<html-erb@w3.org> archive\/latest\/823","Resent-Message-Id":"<199609170249.WAA26226@www19.w3.org>","Resent-From":"html-erb@w3.org","X-List-URL":"http:\/\/www.w3.org\/pub\/WWW\/Archives\/Member\/html-erb\/","Resent-Sender":"html-erb-request@w3.org","X-Loop":"html-erb@w3.org","Encoding":"29 TEXT, 792 UUENCODE, 240 UUENCODE, 864 UUENCODE, 967 UUENCODE,\u000a\u000954 UUENCODE","Resent-Date":"Mon, 16 Sep 1996 22:49:43 -0400","X-See-Also":"http:\/\/www.w3.org\/member\/WWW\/MarkUp\/Group\/","X-Mailer":"Microsoft Exchange Server Internet Mail Connector Version 4.0.994.24","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by strumpet.mcom.com (8.6.10\/8.6.9) with ESMTP id TAA24663 for <montulli@strumpet.mcom.com>; Mon, 16 Sep 1996 19:52:42 -0700","X-MS-Attachment":"overview.htm 0 00-00-1980 00:00","Precedence":"list"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"html-erb-request@w3.org"},"messageID":"c=US%a=_%p=msft%l=RED-99-MSG-960917024837Z-12886@mail2.microsoft.com","receivedDate":"978307200","subject":"Object Model Overviews","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Laurie Anna Edlund (Kaplan)","mailbox":"lakaplan@microsoft.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"'html-erb@w3.org'","mailbox":"html-erb@w3.org"}]},"from":{"class":"mailcore::Address","displayName":"Scott Isaacs","mailbox":"scotti@microsoft.com"},"extraHeaders":{"X-Mailing-List":"<html-erb@w3.org> archive\/latest\/823","Resent-Message-Id":"<199609170249.WAA26226@www19.w3.org>","Resent-From":"html-erb@w3.org","X-List-URL":"http:\/\/www.w3.org\/pub\/WWW\/Archives\/Member\/html-erb\/","Resent-Sender":"html-erb-request@w3.org","X-Loop":"html-erb@w3.org","Encoding":"29 TEXT, 792 UUENCODE, 240 UUENCODE, 864 UUENCODE, 967 UUENCODE,\u000a\u000954 UUENCODE","Resent-Date":"Mon, 16 Sep 1996 22:49:43 -0400","X-See-Also":"http:\/\/www.w3.org\/member\/WWW\/MarkUp\/Group\/","X-Mailer":"Microsoft Exchange Server Internet Mail Connector Version 4.0.994.24","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by strumpet.mcom.com (8.6.10\/8.6.9) with ESMTP id TAA24663 for <montulli@strumpet.mcom.com>; Mon, 16 Sep 1996 19:52:42 -0700","X-MS-Attachment":"overview.htm 0 00-00-1980 00:00","Precedence":"list"},"date":"842928517","sender":{"class":"mailcore::Address","mailbox":"html-erb-request@w3.org"},"messageID":"c=US%a=_%p=msft%l=RED-99-MSG-960917024837Z-12886@mail2.microsoft.com","receivedDate":"842928517","subject":"Object Model Overviews","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/150 b/unittest/data/parser/output/mbox/jwz/150
index a0cdc469..fd212c36 100644
--- a/unittest/data/parser/output/mbox/jwz/150
+++ b/unittest/data/parser/output/mbox/jwz/150
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"},"extraHeaders":{"Return-Path":"<owner-ietf-822@dimacs.rutgers.edu>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_AdLXv9m0M2YtFUaVtZAdLXv9m0M2YtFUaVxW\"","Received":"from dimacs.rutgers.edu by thumper.bellcore.com (4.1\/4.7)\u000a\u0009id <AA17468> for andrew; Sun, 29 Dec 91 18:18:55 EST","Mime-Version":"RFC-XXXX","X-Andrew-Authenticated-As":"0;bambam.sins;The Root of All Evil","X-Andrew-Message-Size":"1628+2"},"date":"978307200","messageID":"4dLXvK_0M2YtBUaW44@thumper.bellcore.com","receivedDate":"978307200","subject":"Another MIME test","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"NSB Speaks","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"},"extraHeaders":{"Return-Path":"<owner-ietf-822@dimacs.rutgers.edu>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_AdLXv9m0M2YtFUaVtZAdLXv9m0M2YtFUaVxW\"","Received":"from dimacs.rutgers.edu by thumper.bellcore.com (4.1\/4.7)\u000a\u0009id <AA17468> for andrew; Sun, 29 Dec 91 18:18:55 EST","Mime-Version":"RFC-XXXX","X-Andrew-Authenticated-As":"0;bambam.sins;The Root of All Evil","X-Andrew-Message-Size":"1628+2"},"date":"694042326","messageID":"4dLXvK_0M2YtBUaW44@thumper.bellcore.com","receivedDate":"694042326","subject":"Another MIME test","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"NSB Speaks","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/152 b/unittest/data/parser/output/mbox/jwz/152
index 73eb9437..c771a466 100644
--- a/unittest/data/parser/output/mbox/jwz/152
+++ b/unittest/data/parser/output/mbox/jwz/152
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"},{"class":"mailcore::Address","mailbox":"paf@comsol.se"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Dave Crocker","mailbox":"dcrocker@mordor.stanford.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_UdV2eZS0M2YtRgpZcG\"","MIME-Version":"1.0","Received":"from Messages.8.1.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Mon, 27 Jan 1992 10:52:05 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"287+1"},"date":"978307200","messageID":"EdV2eZy0M2Yt5gpZkI@thumper.bellcore.com","receivedDate":"978307200","subject":"PS -- Re: RFC-HDR care and feeding","class":"mailcore::MessageHeader","inReplyTo":["9201250907.AA14565@nada.kth.se"],"references":["9201250907.AA14565@nada.kth.se"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Metamail Displaying Patrik's Name","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"},{"class":"mailcore::Address","mailbox":"paf@comsol.se"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Dave Crocker","mailbox":"dcrocker@mordor.stanford.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_UdV2eZS0M2YtRgpZcG\"","MIME-Version":"1.0","Received":"from Messages.8.1.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Mon, 27 Jan 1992 10:52:05 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"287+1"},"date":"696527525","messageID":"EdV2eZy0M2Yt5gpZkI@thumper.bellcore.com","receivedDate":"696527525","subject":"PS -- Re: RFC-HDR care and feeding","class":"mailcore::MessageHeader","inReplyTo":["9201250907.AA14565@nada.kth.se"],"references":["9201250907.AA14565@nada.kth.se"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Metamail Displaying Patrik's Name","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/16 b/unittest/data/parser/output/mbox/jwz/16
index e5944d45..17e593a9 100644
--- a/unittest/data/parser/output/mbox/jwz/16
+++ b/unittest/data/parser/output/mbox/jwz/16
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ysato@etl.go.jp"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Tue, 16 Jun 1992 09:46:49 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","Content-type":"text\/plain; charset=US-ASCII"},"date":"978307200","messageID":"4eDT39K0M2YtMC_2lL@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: MIME & int'l mail","class":"mailcore::MessageHeader","inReplyTo":["gEJO+.ysato@etl.go.jp"],"references":["UeCBvVq0M2Yt4oUA83@thumper.bellcore.com","gEJO+.ysato@etl.go.jp"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ysato@etl.go.jp"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Tue, 16 Jun 1992 09:46:49 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","Content-type":"text\/plain; charset=US-ASCII"},"date":"708702409","messageID":"4eDT39K0M2YtMC_2lL@thumper.bellcore.com","receivedDate":"708702409","subject":"Re: MIME & int'l mail","class":"mailcore::MessageHeader","inReplyTo":["gEJO+.ysato@etl.go.jp"],"references":["UeCBvVq0M2Yt4oUA83@thumper.bellcore.com","gEJO+.ysato@etl.go.jp"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/17 b/unittest/data/parser/output/mbox/jwz/17
index b6213889..ffa4f626 100644
--- a/unittest/data/parser/output/mbox/jwz/17
+++ b/unittest/data/parser/output/mbox/jwz/17
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"atotic@mcom.com"},{"class":"mailcore::Address","mailbox":"jwz@mcom.com"}]},"from":{"class":"mailcore::Address","mailbox":"atotic@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"========================_26885646==_\"","Received":"from neon.netscape.com (steroid.mcom.com [198.93.92.10]) by abattoir.netscape.com (8.6.10\/8.6.9) with ESMTP id QAA26158 for <jwz@abattoir.netscape.com>; Mon, 26 Jun 1995 16:50:29 -0700","Mime-Version":"1.0","X-Sender":"atotic@198.93.92.10","X-VM-v5-Data":"([nil nil nil nil nil nil nil nil nil]\u000a\u0009[nil \"Mon\" \"26\" \"June\" \"1995\" \"16:53:52\" \"-0800\" \"Aleksandar Totic\" \"atotic@netscape.com\" nil \"6272\" \"AppleDouble example\" \"^Date:\" nil nil \"6\" nil nil (mark number \"         26-Jun-95 16:53  Aleks Toti6272  AppleDouble example\u00a5n\") nil]\u000a\u0009nil)"},"date":"978307200","messageID":"ac15067506021004778a@[198.93.92.66]","receivedDate":"978307200","subject":"AppleDouble example","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"application\/applefile","class":"mailcore::Attachment","filename":"%Aete_Editor_b1"},{"partType":"single","uniqueID":"2","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"Aete_Editor_b1"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"atotic@mcom.com"},{"class":"mailcore::Address","mailbox":"jwz@mcom.com"}]},"from":{"class":"mailcore::Address","mailbox":"atotic@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"========================_26885646==_\"","Received":"from neon.netscape.com (steroid.mcom.com [198.93.92.10]) by abattoir.netscape.com (8.6.10\/8.6.9) with ESMTP id QAA26158 for <jwz@abattoir.netscape.com>; Mon, 26 Jun 1995 16:50:29 -0700","Mime-Version":"1.0","X-Sender":"atotic@198.93.92.10","X-VM-v5-Data":"([nil nil nil nil nil nil nil nil nil]\u000a\u0009[nil \"Mon\" \"26\" \"June\" \"1995\" \"16:53:52\" \"-0800\" \"Aleksandar Totic\" \"atotic@netscape.com\" nil \"6272\" \"AppleDouble example\" \"^Date:\" nil nil \"6\" nil nil (mark number \"         26-Jun-95 16:53  Aleks Toti6272  AppleDouble example\u00a5n\") nil]\u000a\u0009nil)"},"date":"804214432","messageID":"ac15067506021004778a@[198.93.92.66]","receivedDate":"804214432","subject":"AppleDouble example","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"application\/applefile","class":"mailcore::Attachment","filename":"%Aete_Editor_b1"},{"partType":"single","uniqueID":"2","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"Aete_Editor_b1"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/18 b/unittest/data/parser/output/mbox/jwz/18
index b6213889..ffa4f626 100644
--- a/unittest/data/parser/output/mbox/jwz/18
+++ b/unittest/data/parser/output/mbox/jwz/18
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"atotic@mcom.com"},{"class":"mailcore::Address","mailbox":"jwz@mcom.com"}]},"from":{"class":"mailcore::Address","mailbox":"atotic@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"========================_26885646==_\"","Received":"from neon.netscape.com (steroid.mcom.com [198.93.92.10]) by abattoir.netscape.com (8.6.10\/8.6.9) with ESMTP id QAA26158 for <jwz@abattoir.netscape.com>; Mon, 26 Jun 1995 16:50:29 -0700","Mime-Version":"1.0","X-Sender":"atotic@198.93.92.10","X-VM-v5-Data":"([nil nil nil nil nil nil nil nil nil]\u000a\u0009[nil \"Mon\" \"26\" \"June\" \"1995\" \"16:53:52\" \"-0800\" \"Aleksandar Totic\" \"atotic@netscape.com\" nil \"6272\" \"AppleDouble example\" \"^Date:\" nil nil \"6\" nil nil (mark number \"         26-Jun-95 16:53  Aleks Toti6272  AppleDouble example\u00a5n\") nil]\u000a\u0009nil)"},"date":"978307200","messageID":"ac15067506021004778a@[198.93.92.66]","receivedDate":"978307200","subject":"AppleDouble example","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"application\/applefile","class":"mailcore::Attachment","filename":"%Aete_Editor_b1"},{"partType":"single","uniqueID":"2","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"Aete_Editor_b1"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"atotic@mcom.com"},{"class":"mailcore::Address","mailbox":"jwz@mcom.com"}]},"from":{"class":"mailcore::Address","mailbox":"atotic@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"========================_26885646==_\"","Received":"from neon.netscape.com (steroid.mcom.com [198.93.92.10]) by abattoir.netscape.com (8.6.10\/8.6.9) with ESMTP id QAA26158 for <jwz@abattoir.netscape.com>; Mon, 26 Jun 1995 16:50:29 -0700","Mime-Version":"1.0","X-Sender":"atotic@198.93.92.10","X-VM-v5-Data":"([nil nil nil nil nil nil nil nil nil]\u000a\u0009[nil \"Mon\" \"26\" \"June\" \"1995\" \"16:53:52\" \"-0800\" \"Aleksandar Totic\" \"atotic@netscape.com\" nil \"6272\" \"AppleDouble example\" \"^Date:\" nil nil \"6\" nil nil (mark number \"         26-Jun-95 16:53  Aleks Toti6272  AppleDouble example\u00a5n\") nil]\u000a\u0009nil)"},"date":"804214432","messageID":"ac15067506021004778a@[198.93.92.66]","receivedDate":"804214432","subject":"AppleDouble example","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"application\/applefile","class":"mailcore::Attachment","filename":"%Aete_Editor_b1"},{"partType":"single","uniqueID":"2","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"Aete_Editor_b1"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/19 b/unittest/data/parser/output/mbox/jwz/19
index 7f7daa48..32b7403a 100644
--- a/unittest/data/parser/output/mbox/jwz/19
+++ b/unittest/data/parser/output/mbox/jwz/19
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Gary Bolstridge","mailbox":"gary@GAROPA.NPT.NUWC.NAVY.MIL"},"extraHeaders":{"Content-Type":"Message\/rfc822","Lines":"16","Newsgroups":"rec.arts.bonsai","Comments":"Gated by NETNEWS@AUVM.AMERICAN.EDU","Mailer":"Elm [revision: 70.85]","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!hookup!paladin.american.edu!auvm!GAROPA.NPT.NUWC.NAVY.MIL!gary","X-Vue-Mime-Level":"4","X-Hpvue$Revision":"1.8 $"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"Internet Bonsai Club","mailbox":"BONSAI@CMS.CC.WAYNE.EDU"},"messageID":"BONSAI%95042607552288@CMS.CC.WAYNE.EDU","receivedDate":"978307200","subject":"Re: Newsletters & Shows","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Gary Bolstridge","mailbox":"gary@GAROPA.NPT.NUWC.NAVY.MIL"},"extraHeaders":{"Content-Type":"Message\/rfc822","Lines":"16","Newsgroups":"rec.arts.bonsai","Comments":"Gated by NETNEWS@AUVM.AMERICAN.EDU","Mailer":"Elm [revision: 70.85]","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!hookup!paladin.american.edu!auvm!GAROPA.NPT.NUWC.NAVY.MIL!gary","X-Vue-Mime-Level":"4","X-Hpvue$Revision":"1.8 $"},"date":"798897009","sender":{"class":"mailcore::Address","displayName":"Internet Bonsai Club","mailbox":"BONSAI@CMS.CC.WAYNE.EDU"},"messageID":"BONSAI%95042607552288@CMS.CC.WAYNE.EDU","receivedDate":"798897009","subject":"Re: Newsletters & Shows","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/21 b/unittest/data/parser/output/mbox/jwz/21
index 26f80529..a1a1c3e0 100644
--- a/unittest/data/parser/output/mbox/jwz/21
+++ b/unittest/data/parser/output/mbox/jwz/21
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"MAILER-DAEMON@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"RAA17252.798941312\/neon.netscape.com\"","Lines":"109","Approved":"usenet@netscape.com","NNTP-Posting-Host":"flop.mcom.com","Newsgroups":"mcom.incoming.client","Mime-Version":"1.0","Path":"flop.mcom.com!news-mail-gateway","Organization":"Local Mail\/News Gateway"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"daemon@flop.mcom.com"},"messageID":"199504270008.RAA17252@neon.netscape.com","receivedDate":"978307200","subject":"Returned mail: Host unknown (Name server: maine.link.net: host not found)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"drwebb@maine.link.net"}]},"from":{"class":"mailcore::Address","displayName":"Christopher Lamey","mailbox":"client@netscape.com"},"extraHeaders":{"Return-Path":"client@netscape.com","X-URL":"news:server-2504951544190001@ub.mcom.com","Newsgroups":"mcom.incoming.client","X-Mailer":"Mozilla 1.1N (Macintosh; I; 68K)","Received":"from cronos.mcom.com (cronos.mcom.com [198.93.94.116]) by neon.netscape.com (950215.SGI.8.6.10\/8.6.9) with SMTP id RAA17240 for <drwebb@maine.link.net>; Wed, 26 Apr 1995 17:08:30 -0700","Organization":"Netscape Communications"},"date":"3954676448","messageID":"199504270008.RAA17240@neon.netscape.com","receivedDate":"3954676448","subject":"Re: 90 Day product Support","class":"mailcore::MessageHeader","references":["199504251257.IAA09959@maine.mainelink.net","server-2504951544190001@ub.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"MAILER-DAEMON@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"RAA17252.798941312\/neon.netscape.com\"","Lines":"109","Approved":"usenet@netscape.com","NNTP-Posting-Host":"flop.mcom.com","Newsgroups":"mcom.incoming.client","Mime-Version":"1.0","Path":"flop.mcom.com!news-mail-gateway","Organization":"Local Mail\/News Gateway"},"date":"798941315","sender":{"class":"mailcore::Address","mailbox":"daemon@flop.mcom.com"},"messageID":"199504270008.RAA17252@neon.netscape.com","receivedDate":"798941315","subject":"Returned mail: Host unknown (Name server: maine.link.net: host not found)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"drwebb@maine.link.net"}]},"from":{"class":"mailcore::Address","displayName":"Christopher Lamey","mailbox":"client@netscape.com"},"extraHeaders":{"Return-Path":"client@netscape.com","X-URL":"news:server-2504951544190001@ub.mcom.com","Newsgroups":"mcom.incoming.client","X-Mailer":"Mozilla 1.1N (Macintosh; I; 68K)","Received":"from cronos.mcom.com (cronos.mcom.com [198.93.94.116]) by neon.netscape.com (950215.SGI.8.6.10\/8.6.9) with SMTP id RAA17240 for <drwebb@maine.link.net>; Wed, 26 Apr 1995 17:08:30 -0700","Organization":"Netscape Communications"},"date":"3954676448","messageID":"199504270008.RAA17240@neon.netscape.com","receivedDate":"3954676448","subject":"Re: 90 Day product Support","class":"mailcore::MessageHeader","references":["199504251257.IAA09959@maine.mainelink.net","server-2504951544190001@ub.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/22 b/unittest/data/parser/output/mbox/jwz/22
index 03f9b38d..68b6f0fc 100644
--- a/unittest/data/parser/output/mbox/jwz/22
+++ b/unittest/data/parser/output/mbox/jwz/22
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"atzet@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"mailusr1@navstar1.mcom.com"},"extraHeaders":{"Return-Path":"<>","Content-Type":"multipart\/mixed;;\u000a                Boundary=\"===========================_ _= 1212158(26598)\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","Content-Transfer-Encoding":"7bit","Received":"from navstar1.mcom.com ([205.217.251.46]) by hedgehog.mcom.com\u000a          (Netscape Mail Server v1.1) with ESMTP id AAA29011\u000a          for <atzet@netscape.com> Sun, 21 Jul 1996 16:59:17 -0700","Content-Length":"1213"},"date":"978307200","messageID":"19960722000255.AAA26598@navstar1.mcom.com","receivedDate":"978307200","subject":"Re: mailusr1@navstar1 3.0b6gold #1","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mailusr1@navstar1.mcom.com"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"multipart\/mixed","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"atzet@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"mailusr1@navstar1.mcom.com"},"extraHeaders":{"Return-Path":"<>","Content-Type":"multipart\/mixed;;\u000a                Boundary=\"===========================_ _= 1212158(26598)\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","Content-Transfer-Encoding":"7bit","Received":"from navstar1.mcom.com ([205.217.251.46]) by hedgehog.mcom.com\u000a          (Netscape Mail Server v1.1) with ESMTP id AAA29011\u000a          for <atzet@netscape.com> Sun, 21 Jul 1996 16:59:17 -0700","Content-Length":"1213"},"date":"837997375","messageID":"19960722000255.AAA26598@navstar1.mcom.com","receivedDate":"837997375","subject":"Re: mailusr1@navstar1 3.0b6gold #1","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mailusr1@navstar1.mcom.com"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"multipart\/mixed","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/23 b/unittest/data/parser/output/mbox/jwz/23
index 4e5eb227..64ba1b0f 100644
--- a/unittest/data/parser/output/mbox/jwz/23
+++ b/unittest/data/parser/output/mbox/jwz/23
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"ross@iclc.net"},"extraHeaders":{"Content-Type":"Application\/octet-stream","Lines":"46","X-Newsreader":"WinVN 0.92.6+","NNTP-Posting-Host":"shade.iclc.net","Newsgroups":"misc.entrepreneurs","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!hookup!news.moneng.mei.com!howland.reston.ans.net!news.sprintlink.net!news.ip.net!news.iclc.net!usenet","Organization":"HALLE ASSOCIATES"},"date":"978307200","messageID":"3njncv$1kh@castle.iclc.net","receivedDate":"978307200","subject":"I  DID  IT - I'm a New Entrepreneur  -","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/octet-stream","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"ross@iclc.net"},"extraHeaders":{"Content-Type":"Application\/octet-stream","Lines":"46","X-Newsreader":"WinVN 0.92.6+","NNTP-Posting-Host":"shade.iclc.net","Newsgroups":"misc.entrepreneurs","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!hookup!news.moneng.mei.com!howland.reston.ans.net!news.sprintlink.net!news.ip.net!news.iclc.net!usenet","Organization":"HALLE ASSOCIATES"},"date":"798843103","messageID":"3njncv$1kh@castle.iclc.net","receivedDate":"798843103","subject":"I  DID  IT - I'm a New Entrepreneur  -","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/octet-stream","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/24 b/unittest/data/parser/output/mbox/jwz/24
index b4706f62..d8837ce6 100644
--- a/unittest/data/parser/output/mbox/jwz/24
+++ b/unittest/data/parser/output/mbox/jwz/24
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"skyojedi@phoenix.net"},"extraHeaders":{"Content-Type":"message\/partial;\u000a     id=\"799653575@Skywalker of the Jedi\";\u000a     number=1; total=5","Lines":"954","X-Newsreader":"WinVN 0.93.10","NNTP-Posting-Host":"dial47.phoenix.net","Newsgroups":"rec.games.video.3do","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!howland.reston.ans.net!news.sprintlink.net!gryphon.phoenix.net!news","Organization":"Your Organization"},"date":"978307200","messageID":"3oc8h3$edc@gryphon.phoenix.net","receivedDate":"978307200","subject":"M2 Screenshots from GO! - 4 Attachments [1\/5]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"skyojedi@phoenix.net"},"extraHeaders":{"Content-Type":"message\/partial;\u000a     id=\"799653575@Skywalker of the Jedi\";\u000a     number=1; total=5","Lines":"954","X-Newsreader":"WinVN 0.93.10","NNTP-Posting-Host":"dial47.phoenix.net","Newsgroups":"rec.games.video.3do","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!howland.reston.ans.net!news.sprintlink.net!gryphon.phoenix.net!news","Organization":"Your Organization"},"date":"799647075","messageID":"3oc8h3$edc@gryphon.phoenix.net","receivedDate":"799647075","subject":"M2 Screenshots from GO! - 4 Attachments [1\/5]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/25 b/unittest/data/parser/output/mbox/jwz/25
index 6cd292f8..a59cb4f3 100644
--- a/unittest/data/parser/output/mbox/jwz/25
+++ b/unittest/data/parser/output/mbox/jwz/25
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"skyojedi@phoenix.net"},"extraHeaders":{"Content-Type":"message\/partial;\u000a     id=\"799652823@Skywalker of the Jedi\";\u000a     number=1; total=2","Lines":"960","X-Newsreader":"WinVN 0.93.10","NNTP-Posting-Host":"dial47.phoenix.net","Newsgroups":"rec.games.video.3do","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!howland.reston.ans.net!news.sprintlink.net!gryphon.phoenix.net!news","Organization":"Your Organization"},"date":"978307200","messageID":"3oc7nm$edc@gryphon.phoenix.net","receivedDate":"978307200","subject":"M2 Screenshots from GO! - 3dom21.jpg [1\/2]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"skyojedi@phoenix.net"},"extraHeaders":{"Content-Type":"message\/partial;\u000a     id=\"799652823@Skywalker of the Jedi\";\u000a     number=1; total=2","Lines":"960","X-Newsreader":"WinVN 0.93.10","NNTP-Posting-Host":"dial47.phoenix.net","Newsgroups":"rec.games.video.3do","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!howland.reston.ans.net!news.sprintlink.net!gryphon.phoenix.net!news","Organization":"Your Organization"},"date":"799646262","messageID":"3oc7nm$edc@gryphon.phoenix.net","receivedDate":"799646262","subject":"M2 Screenshots from GO! - 3dom21.jpg [1\/2]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/26 b/unittest/data/parser/output/mbox/jwz/26
index 248959c6..6b0bc57f 100644
--- a/unittest/data/parser/output/mbox/jwz/26
+++ b/unittest/data/parser/output/mbox/jwz/26
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","mailbox":"bob@cs.su.oz.au"},"extraHeaders":{"Return-Path":"<bob@sarad.cs.su.oz.au>","Content-Type":"multipart\/mixed; boundary=\"partsep28042\"","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA24448> for nsb; Sat, 18 Jan 92 01:20:08 EST","Mime-Version":"1.0"},"date":"978307200","messageID":"9201180620.AA17087@thumper.bellcore.com","receivedDate":"978307200","subject":"another Hebrew test","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"iso-8859-8","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","mailbox":"bob@cs.su.oz.au"},"extraHeaders":{"Return-Path":"<bob@sarad.cs.su.oz.au>","Content-Type":"multipart\/mixed; boundary=\"partsep28042\"","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA24448> for nsb; Sat, 18 Jan 92 01:20:08 EST","Mime-Version":"1.0"},"date":"695755140","messageID":"9201180620.AA17087@thumper.bellcore.com","receivedDate":"695755140","subject":"another Hebrew test","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"iso-8859-8","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/29 b/unittest/data/parser/output/mbox/jwz/29
index 6a143487..887a44df 100644
--- a/unittest/data/parser/output/mbox/jwz/29
+++ b/unittest/data/parser/output/mbox/jwz/29
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Bob Oesterlin","mailbox":"oester+@rchland.ibm.com"},"extraHeaders":{"Return-Path":"<oester@vnet.ibm.com>","If-Type-Unsupported":"send","Content-Type":"X-BE2; 12","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA22720> for nsb; Mon, 8 Jun 92 15:59:26 EDT","X-Andrew-Message-Size":"388+1"},"date":"978307200","messageID":"seAvcao91JbyQwDlE=@rchland.ibm.com","receivedDate":"978307200","subject":"\/usr\/sbin\/sfplay","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bob Oesterlin","mailbox":"oester@vnet.ibm.com"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"X-BE2\/unknown","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Bob Oesterlin","mailbox":"oester+@rchland.ibm.com"},"extraHeaders":{"Return-Path":"<oester@vnet.ibm.com>","If-Type-Unsupported":"send","Content-Type":"X-BE2; 12","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA22720> for nsb; Mon, 8 Jun 92 15:59:26 EDT","X-Andrew-Message-Size":"388+1"},"date":"708033062","messageID":"seAvcao91JbyQwDlE=@rchland.ibm.com","receivedDate":"708033062","subject":"\/usr\/sbin\/sfplay","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bob Oesterlin","mailbox":"oester@vnet.ibm.com"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"X-BE2\/unknown","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/3 b/unittest/data/parser/output/mbox/jwz/3
index 5031eeae..0978b141 100644
--- a/unittest/data/parser/output/mbox/jwz/3
+++ b/unittest/data/parser/output/mbox/jwz/3
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Transfer-Encoding":"quoted-printable","Content-type":"text\/plain; charset=iso-8859-8"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"test of \u05ea\u05d9\u05e8\u05d1\u05e2 in mail headers","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"iso-8859-8","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Transfer-Encoding":"quoted-printable","Content-type":"text\/plain; charset=iso-8859-8"},"date":"697395097","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"697395097","subject":"test of \u05ea\u05d9\u05e8\u05d1\u05e2 in mail headers","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"iso-8859-8","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/30 b/unittest/data/parser/output/mbox/jwz/30
index f0ba3535..623b0f93 100644
--- a/unittest/data/parser/output/mbox/jwz/30
+++ b/unittest/data/parser/output/mbox/jwz/30
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3nl0gd$l55@flop.mcom.com","Content-Type":"message\/rfc822","Lines":"103","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Content-Transfer-Encoding":"7bit","Mime-Version":"1.0","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"3nl1gc$lkb@flop.mcom.com","receivedDate":"978307200","subject":"Re: attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com","3nkvv6$kmf@flop.mcom.com","3nl02e$kmf@flop.mcom.com","3nl0gd$l55@flop.mcom.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3nl02e$kmf@flop.mcom.com","Lines":"86","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"3nl0gd$l55@flop.mcom.com","receivedDate":"978307200","subject":"Re: attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com","3nkvv6$kmf@flop.mcom.com","3nl02e$kmf@flop.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3nkvv6$kmf@flop.mcom.com","Lines":"69","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"3nl02e$kmf@flop.mcom.com","receivedDate":"978307200","subject":"Re: attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com","3nkvv6$kmf@flop.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3na39m$3lf@flop.mcom.com","Lines":"52","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"3nkvv6$kmf@flop.mcom.com","receivedDate":"978307200","subject":"attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"sharoni"}]},"from":{"class":"mailcore::Address","displayName":"Sharon Iimura","mailbox":"sharoni"},"extraHeaders":{"X-URL":"http:\/\/home.netscape.com\/eng\/mozilla\/1.1\/unix-1.1.html","Lines":"22","NNTP-Posting-Host":"diva.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; SunOS 5.4 sun4m)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporations"},"date":"978307200","messageID":"3na39m$3lf@flop.mcom.com","receivedDate":"978307200","subject":"Test for Bug 4498","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/html","class":"mailcore::Attachment"}]}}}]}}}}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3nl0gd$l55@flop.mcom.com","Content-Type":"message\/rfc822","Lines":"103","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Content-Transfer-Encoding":"7bit","Mime-Version":"1.0","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"798886220","messageID":"3nl1gc$lkb@flop.mcom.com","receivedDate":"798886220","subject":"Re: attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com","3nkvv6$kmf@flop.mcom.com","3nl02e$kmf@flop.mcom.com","3nl0gd$l55@flop.mcom.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3nl02e$kmf@flop.mcom.com","Lines":"86","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"798885197","messageID":"3nl0gd$l55@flop.mcom.com","receivedDate":"798885197","subject":"Re: attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com","3nkvv6$kmf@flop.mcom.com","3nl02e$kmf@flop.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3nkvv6$kmf@flop.mcom.com","Lines":"69","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"798884750","messageID":"3nl02e$kmf@flop.mcom.com","receivedDate":"798884750","subject":"Re: attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com","3nkvv6$kmf@flop.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"news:3na39m$3lf@flop.mcom.com","Lines":"52","NNTP-Posting-Host":"lr1-port2.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; Linux 1.1.47 i586)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"798884646","messageID":"3nkvv6$kmf@flop.mcom.com","receivedDate":"798884646","subject":"attach this, spanky","class":"mailcore::MessageHeader","references":["3na39m$3lf@flop.mcom.com"]},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"sharoni"}]},"from":{"class":"mailcore::Address","displayName":"Sharon Iimura","mailbox":"sharoni"},"extraHeaders":{"X-URL":"http:\/\/home.netscape.com\/eng\/mozilla\/1.1\/unix-1.1.html","Lines":"22","NNTP-Posting-Host":"diva.mcom.com","Newsgroups":"mcom.test","X-Mailer":"Mozilla 1.1 (X11; U; SunOS 5.4 sun4m)","Path":"flop.mcom.com!usenet","Organization":"Netscape Communications Corporations"},"date":"798527606","messageID":"3na39m$3lf@flop.mcom.com","receivedDate":"798527606","subject":"Test for Bug 4498","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/html","class":"mailcore::Attachment"}]}}}]}}}}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/32 b/unittest/data/parser/output/mbox/jwz/32
index e7b6f6b7..41412053 100644
--- a/unittest/data/parser/output/mbox/jwz/32
+++ b/unittest/data/parser/output/mbox/jwz/32
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@Tomobiki-Cho.CAC.Washington.EDU"},"extraHeaders":{"Content-Type":"TEXT\/PLAIN; charset=ISO-2022-JP","X-Andrew-WideReply":"netnews.comp.sys.next.misc","Newsgroups":"comp.sys.next.misc","Received":"via nntppoll with nntp; Sun,  3 May 1992 20:23:55 -0400 (EDT)","Mime-Version":"1.0","Path":"thumper.bellcore.com!walter!att!linac!uwm.edu!rpi!usenet.coe.montana.edu!news.u.washington.edu!news","Organization":"University of Washington","X-Andrew-Authenticated-as":"0;thumper.bellcore.com;Network-Mail"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"news@u.washington.edu"},"messageID":"MS-C.704934477.377401575.mrc@Tomobiki-Cho.CAC.Washington.EDU","receivedDate":"978307200","subject":"what's the use","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"ISO-2022-JP","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@Tomobiki-Cho.CAC.Washington.EDU"},"extraHeaders":{"Content-Type":"TEXT\/PLAIN; charset=ISO-2022-JP","X-Andrew-WideReply":"netnews.comp.sys.next.misc","Newsgroups":"comp.sys.next.misc","Received":"via nntppoll with nntp; Sun,  3 May 1992 20:23:55 -0400 (EDT)","Mime-Version":"1.0","Path":"thumper.bellcore.com!walter!att!linac!uwm.edu!rpi!usenet.coe.montana.edu!news.u.washington.edu!news","Organization":"University of Washington","X-Andrew-Authenticated-as":"0;thumper.bellcore.com;Network-Mail"},"date":"704934477","sender":{"class":"mailcore::Address","mailbox":"news@u.washington.edu"},"messageID":"MS-C.704934477.377401575.mrc@Tomobiki-Cho.CAC.Washington.EDU","receivedDate":"704934477","subject":"what's the use","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"ISO-2022-JP","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/33 b/unittest/data/parser/output/mbox/jwz/33
index 2445a0f9..c812c554 100644
--- a/unittest/data/parser/output/mbox/jwz/33
+++ b/unittest/data/parser/output/mbox/jwz/33
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"msgs"}]},"from":{"class":"mailcore::Address","displayName":"Tom Brinck","mailbox":"hammer"},"extraHeaders":{"Return-Path":"<hammer>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.ge=Dx0m0M26IQ17rd0\"","Received":"from greenbush.bellcore.com by bambam.bellcore.com (4.1\/4.7)\u000a\u0009id <AA09071> for andrew; Wed, 3 Jun 92 13:20:09 EDT","Mime-Version":"1.0","X-Andrew-Authenticated-As":"0;bambam.galaxy;The Root of All Evil","X-Andrew-Message-Size":"323+1"},"date":"978307200","messageID":"8e=Dx1S0M26IE17rlY@thumper.bellcore.com","receivedDate":"978307200","subject":"misdirected chinese mail","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/x-xbm","contentDescription":"Push here to see your name","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"msgs"}]},"from":{"class":"mailcore::Address","displayName":"Tom Brinck","mailbox":"hammer"},"extraHeaders":{"Return-Path":"<hammer>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.ge=Dx0m0M26IQ17rd0\"","Received":"from greenbush.bellcore.com by bambam.bellcore.com (4.1\/4.7)\u000a\u0009id <AA09071> for andrew; Wed, 3 Jun 92 13:20:09 EDT","Mime-Version":"1.0","X-Andrew-Authenticated-As":"0;bambam.galaxy;The Root of All Evil","X-Andrew-Message-Size":"323+1"},"date":"707592001","messageID":"8e=Dx1S0M26IE17rlY@thumper.bellcore.com","receivedDate":"707592001","subject":"misdirected chinese mail","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/x-xbm","contentDescription":"Push here to see your name","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/35 b/unittest/data/parser/output/mbox/jwz/35
index 015f4836..275eadb3 100644
--- a/unittest/data/parser/output/mbox/jwz/35
+++ b/unittest/data/parser/output/mbox/jwz/35
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"ohm@aksi.net"},"extraHeaders":{"Content-Type":"Image\/JPEG","Lines":"186","X-Newsreader":"WinVN 0.93.14","NNTP-Posting-Host":"d137.aksi.net","Newsgroups":"alt.sex.fetish.feet","Content-Transfer-Encoding":"x-uue","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!agate!howland.reston.ans.net!news.sprintlink.net!wn.aksi.net!news","Organization":"Ohm LTD."},"date":"978307200","messageID":"3nk0dr$adp@wn.aksi.net","receivedDate":"978307200","subject":"nylon feet by request - ind_111.jpg [1\/1]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"image\/JPEG","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"ohm@aksi.net"},"extraHeaders":{"Content-Type":"Image\/JPEG","Lines":"186","X-Newsreader":"WinVN 0.93.14","NNTP-Posting-Host":"d137.aksi.net","Newsgroups":"alt.sex.fetish.feet","Content-Transfer-Encoding":"x-uue","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!agate!howland.reston.ans.net!news.sprintlink.net!wn.aksi.net!news","Organization":"Ohm LTD."},"date":"798852347","messageID":"3nk0dr$adp@wn.aksi.net","receivedDate":"798852347","subject":"nylon feet by request - ind_111.jpg [1\/1]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"image\/JPEG","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/38 b/unittest/data/parser/output/mbox/jwz/38
index 6fd6e03a..f8ee3f64 100644
--- a/unittest/data/parser/output/mbox/jwz/38
+++ b/unittest/data/parser/output/mbox/jwz/38
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------167E2781446B\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Content-Length":"3748","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C105ED.41C62@netscape.com","receivedDate":"978307200","subject":"attached image cache test (test 2: inline disposition)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C10324.41C62@netscape.com","receivedDate":"978307200","subject":"test message one (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"5","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"single","uniqueID":"0","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"one.gif"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"two.gif"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"three.gif"},{"partType":"single","uniqueID":"3","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"four.gif"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C10333.167E2@netscape.com","receivedDate":"978307200","subject":"test message two (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"6","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C106F6.59E22@netscape.com","receivedDate":"978307200","subject":"a message which contains a message\u000a\u0009(which contains a message, which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C106E3.15FB2@netscape.com","receivedDate":"978307200","subject":"a message which contains a message\u000a\u0009(which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C106D2.794B2@netscape.com","receivedDate":"978307200","subject":"a message with a text\/plain body","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"7","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}}},{"partType":"single","uniqueID":"4","mimeType":"text\/html","inlineAttachment":"1","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------167E2781446B\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Content-Length":"3748","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733549","messageID":"31C105ED.41C62@netscape.com","receivedDate":"834733549","subject":"attached image cache test (test 2: inline disposition)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834732836","messageID":"31C10324.41C62@netscape.com","receivedDate":"834732836","subject":"test message one (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"5","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"single","uniqueID":"0","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"one.gif"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"two.gif"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"three.gif"},{"partType":"single","uniqueID":"3","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"four.gif"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834732851","messageID":"31C10333.167E2@netscape.com","receivedDate":"834732851","subject":"test message two (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"6","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733814","messageID":"31C106F6.59E22@netscape.com","receivedDate":"834733814","subject":"a message which contains a message\u000a\u0009(which contains a message, which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733795","messageID":"31C106E3.15FB2@netscape.com","receivedDate":"834733795","subject":"a message which contains a message\u000a\u0009(which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733778","messageID":"31C106D2.794B2@netscape.com","receivedDate":"834733778","subject":"a message with a text\/plain body","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"7","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}}},{"partType":"single","uniqueID":"4","mimeType":"text\/html","inlineAttachment":"1","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/39 b/unittest/data/parser/output/mbox/jwz/39
index 89a7be71..f8e26c11 100644
--- a/unittest/data/parser/output/mbox/jwz/39
+++ b/unittest/data/parser/output/mbox/jwz/39
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------167E2781446B\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Content-Length":"3748","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C105ED.41C6@netscape.com","receivedDate":"978307200","subject":"attached image cache test (test 1: attachment disposition)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C10324.41C6@netscape.com","receivedDate":"978307200","subject":"test message one (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"5","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"single","uniqueID":"0","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"one.gif"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"two.gif"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"three.gif"},{"partType":"single","uniqueID":"3","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"four.gif"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C10333.167E@netscape.com","receivedDate":"978307200","subject":"test message two (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"6","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C106F6.59E2@netscape.com","receivedDate":"978307200","subject":"a message which contains a message\u000a\u0009(which contains a message, which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C106E3.15FB@netscape.com","receivedDate":"978307200","subject":"a message which contains a message\u000a\u0009(which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31C106D2.794B@netscape.com","receivedDate":"978307200","subject":"a message with a text\/plain body","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"7","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}}},{"partType":"single","uniqueID":"4","mimeType":"text\/html","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------167E2781446B\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Content-Length":"3748","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733549","messageID":"31C105ED.41C6@netscape.com","receivedDate":"834733549","subject":"attached image cache test (test 1: attachment disposition)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834732836","messageID":"31C10324.41C6@netscape.com","receivedDate":"834732836","subject":"test message one (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"5","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"single","uniqueID":"0","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"one.gif"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"two.gif"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"three.gif"},{"partType":"single","uniqueID":"3","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"four.gif"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834732851","messageID":"31C10333.167E@netscape.com","receivedDate":"834732851","subject":"test message two (a message with a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"6","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733814","messageID":"31C106F6.59E2@netscape.com","receivedDate":"834733814","subject":"a message which contains a message\u000a\u0009(which contains a message, which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733795","messageID":"31C106E3.15FB@netscape.com","receivedDate":"834733795","subject":"a message which contains a message\u000a\u0009(which has a text\/plain body)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-Mailer":"Mozilla 3.0b5 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"834733778","messageID":"31C106D2.794B@netscape.com","receivedDate":"834733778","subject":"a message with a text\/plain body","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"7","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}}},{"partType":"single","uniqueID":"4","mimeType":"text\/html","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/4 b/unittest/data/parser/output/mbox/jwz/4
index 627baea1..1e5304b7 100644
--- a/unittest/data/parser/output/mbox/jwz/4
+++ b/unittest/data/parser/output/mbox/jwz/4
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Ned Freed","mailbox":"ned@innosoft.com"},{"class":"mailcore::Address","mailbox":"ysato@etl.go.jp"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.IeCBvV20M2YtEoUA0A\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Fri, 12 Jun 1992 13:29:05 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"152+1"},"date":"978307200","messageID":"UeCBvVq0M2Yt4oUA83@thumper.bellcore.com","receivedDate":"978307200","subject":"MIME & int'l mail","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Some international characters","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Ned Freed","mailbox":"ned@innosoft.com"},{"class":"mailcore::Address","mailbox":"ysato@etl.go.jp"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.IeCBvV20M2YtEoUA0A\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Fri, 12 Jun 1992 13:29:05 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"152+1"},"date":"708370145","messageID":"UeCBvVq0M2Yt4oUA83@thumper.bellcore.com","receivedDate":"708370145","subject":"MIME & int'l mail","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Some international characters","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/40 b/unittest/data/parser/output/mbox/jwz/40
index b02795f1..31b837ba 100644
--- a/unittest/data/parser/output/mbox/jwz/40
+++ b/unittest/data/parser/output/mbox/jwz/40
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski, with suffix & ampersand","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"http:\/\/home.netscape.com","Content-Type":"multipart\/mixed; boundary=ONE","Stupid-Commentary":"this is a test.\u000a\u0009this is only a test.\u000a\u0009this is a test of the emergency URL locator system.\u000a\u0009<http:\/\/home.netscape.com>\u000a\u0009this is only a test.","Newsgroups":"netscape.general","Mime-Version":"1.0","Organization":"","Random-header":">beginning with a greater-than"},"date":"978307200","messageID":"3ltdfq$j50@secnews.netscape.com","receivedDate":"978307200","subject":"posting HTML (was Re: Public News Server)","class":"mailcore::MessageHeader","references":["3lmtu0$dv1@secnews.netscape.com","3lpjth$g97@secnews.netscape.com","3lrbuf$gvp@secnews.netscape.com","3lst13$iur@secnews.netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz"},"extraHeaders":{"Organization":"blargh","Date":"Sun Apr 23 02:25:07 1995"},"date":"978307200","messageID":"spankulate@secnews.netscape.com","receivedDate":"978307200","subject":"it's not my damn planet, monkey-boy","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"9","mimeType":"text\/html","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"image\/unknown","contentDescription":"this isn't an image at all, but","class":"mailcore::Attachment"}]}}},{"partType":"single","uniqueID":"4","mimeType":"image\/x-xbitmap","contentDescription":"this is an xbm of a shark","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"image\/unknown","contentDescription":"this isn't an image at all, but","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/x-xbitmap","contentDescription":"this is the same shark xbm, but in quoted-printable","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"11","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"12","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"13","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"single","uniqueID":"7","mimeType":"text\/html","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"14","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski, with suffix & ampersand","mailbox":"jwz@netscape.com"},"extraHeaders":{"X-URL":"http:\/\/home.netscape.com","Content-Type":"multipart\/mixed; boundary=ONE","Stupid-Commentary":"this is a test.\u000a\u0009this is only a test.\u000a\u0009this is a test of the emergency URL locator system.\u000a\u0009<http:\/\/home.netscape.com>\u000a\u0009this is only a test.","Newsgroups":"netscape.general","Mime-Version":"1.0","Organization":"","Random-header":">beginning with a greater-than"},"date":"797063482","messageID":"3ltdfq$j50@secnews.netscape.com","receivedDate":"797063482","subject":"posting HTML (was Re: Public News Server)","class":"mailcore::MessageHeader","references":["3lmtu0$dv1@secnews.netscape.com","3lpjth$g97@secnews.netscape.com","3lrbuf$gvp@secnews.netscape.com","3lst13$iur@secnews.netscape.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"message","header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz"},"extraHeaders":{"Organization":"blargh","Date":"Sun Apr 23 02:25:07 1995"},"date":"978307200","messageID":"spankulate@secnews.netscape.com","receivedDate":"978307200","subject":"it's not my damn planet, monkey-boy","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"9","mimeType":"text\/html","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"image\/unknown","contentDescription":"this isn't an image at all, but","class":"mailcore::Attachment"}]}}},{"partType":"single","uniqueID":"4","mimeType":"image\/x-xbitmap","contentDescription":"this is an xbm of a shark","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"image\/unknown","contentDescription":"this isn't an image at all, but","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/x-xbitmap","contentDescription":"this is the same shark xbm, but in quoted-printable","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"11","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"12","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"13","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"single","uniqueID":"7","mimeType":"text\/html","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"14","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/45 b/unittest/data/parser/output/mbox/jwz/45
index 590130c5..5c1a5f6c 100644
--- a/unittest/data/parser/output/mbox/jwz/45
+++ b/unittest/data/parser/output/mbox/jwz/45
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"support@halsoft.com"},"extraHeaders":{"Content-Type":"multipart\/mixed;\u000a\u0009boundary=\"bODY.pART.bOUNDARY.2\"","Apparently-To":"jwz@gunwale.mcom.com","Received":"from gunwale.mcom.com (gunwale.mcom.com [198.95.250.11]) by abattoir.netscape.com (8.6.10\/8.6.9) with ESMTP id DAA18866 for <jwz@abattoir.netscape.com>; Sun, 30 Apr 1995 03:04:30 -0700","Mime-Version":"1.0","X-VM-v5-Data":"([nil nil nil nil nil nil nil nil nil]\u000a\u0009[nil nil nil nil nil nil nil nil nil nil nil nil \"^Date:\" nil nil nil nil nil nil nil]\u000a\u0009nil)"},"date":"978307200","messageID":"199504301000.DAA08377@gunwale.mcom.com","receivedDate":"978307200","subject":"Welcome to Ishmail","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","contentDescription":"Our company logo","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"audio\/basic","contentDescription":"A famous personality speaks out","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"message\/external-body","class":"mailcore::Attachment","filename":"\/etc\/passwd"},{"partType":"single","uniqueID":"6","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"message\/external-body","class":"mailcore::Attachment","filename":"README.ftp"},{"partType":"single","uniqueID":"8","mimeType":"text\/enriched","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"support@halsoft.com"},"extraHeaders":{"Content-Type":"multipart\/mixed;\u000a\u0009boundary=\"bODY.pART.bOUNDARY.2\"","Apparently-To":"jwz@gunwale.mcom.com","Received":"from gunwale.mcom.com (gunwale.mcom.com [198.95.250.11]) by abattoir.netscape.com (8.6.10\/8.6.9) with ESMTP id DAA18866 for <jwz@abattoir.netscape.com>; Sun, 30 Apr 1995 03:04:30 -0700","Mime-Version":"1.0","X-VM-v5-Data":"([nil nil nil nil nil nil nil nil nil]\u000a\u0009[nil nil nil nil nil nil nil nil nil nil nil nil \"^Date:\" nil nil nil nil nil nil nil]\u000a\u0009nil)"},"date":"799236019","messageID":"199504301000.DAA08377@gunwale.mcom.com","receivedDate":"799236019","subject":"Welcome to Ishmail","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","contentDescription":"Our company logo","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"audio\/basic","contentDescription":"A famous personality speaks out","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"message\/external-body","class":"mailcore::Attachment","filename":"\/etc\/passwd"},{"partType":"single","uniqueID":"6","mimeType":"text\/enriched","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"message\/external-body","class":"mailcore::Attachment","filename":"README.ftp"},{"partType":"single","uniqueID":"8","mimeType":"text\/enriched","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/47 b/unittest/data/parser/output/mbox/jwz/47
index 97d96662..9d7abda2 100644
--- a/unittest/data/parser/output/mbox/jwz/47
+++ b/unittest/data/parser/output/mbox/jwz/47
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"Neil.Katin@eng.sun.com"},{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Keld J|rn Simonsen","mailbox":"keld@dkuug.dk"}]},"from":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"MRC@panda.com"},"extraHeaders":{"Return-Path":"<owner-ietf-822@dimacs.rutgers.edu>","Content-Type":"MULTIPART\/MIXED;boundary=\"16816888-2078917053-688452093:#2321\"","MIME-Version":"RFC-XXXX","Received":"from dimacs.rutgers.edu by thumper.bellcore.com (4.1\/4.7)\u000a\u0009id <AA09047> for andrew; Sat, 26 Oct 91 03:16:34 EDT","X-Andrew-Authenticated-As":"0;bambam.sins;The Root of All Evil"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@ikkoku-kan.panda.com"},"messageID":"MailManager.688451978.2321.mrc@Ikkoku-Kan.Panda.COM","receivedDate":"978307200","subject":"re: more content-charset stuff","class":"mailcore::MessageHeader","inReplyTo":["9110251926.AA11580@dkuug.dk"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"audio\/basic","contentDescription":"voice mail","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"Neil.Katin@eng.sun.com"},{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Keld J|rn Simonsen","mailbox":"keld@dkuug.dk"}]},"from":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"MRC@panda.com"},"extraHeaders":{"Return-Path":"<owner-ietf-822@dimacs.rutgers.edu>","Content-Type":"MULTIPART\/MIXED;boundary=\"16816888-2078917053-688452093:#2321\"","MIME-Version":"RFC-XXXX","Received":"from dimacs.rutgers.edu by thumper.bellcore.com (4.1\/4.7)\u000a\u0009id <AA09047> for andrew; Sat, 26 Oct 91 03:16:34 EDT","X-Andrew-Authenticated-As":"0;bambam.sins;The Root of All Evil"},"date":"688451978","sender":{"class":"mailcore::Address","displayName":"Mark Crispin","mailbox":"mrc@ikkoku-kan.panda.com"},"messageID":"MailManager.688451978.2321.mrc@Ikkoku-Kan.Panda.COM","receivedDate":"688451978","subject":"re: more content-charset stuff","class":"mailcore::MessageHeader","inReplyTo":["9110251926.AA11580@dkuug.dk"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"audio\/basic","contentDescription":"voice mail","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/48 b/unittest/data/parser/output/mbox/jwz/48
index 0d6174c3..b607a8c4 100644
--- a/unittest/data/parser/output/mbox/jwz/48
+++ b/unittest/data/parser/output/mbox/jwz/48
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Michael Littman","mailbox":"mlittman"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"rsw@cs.brown.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_MdP9G7i0M2YtQbPlt5MdP9G7i0M2YtMbPlxY\"","MIME-Version":"1.0","Received":"from Messages.8.1.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Thu,  9 Jan 1992 13:30:05 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"438+3"},"date":"978307200","messageID":"MdP9Ghe0M2YtMbPm5Q@thumper.bellcore.com","receivedDate":"978307200","subject":"How MIME looks in AMS (MIME format)","class":"mailcore::MessageHeader","inReplyTo":["9201061308.AA17408@pebbles.cs.brown.edu"],"references":["9201061308.AA17408@pebbles.cs.brown.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Jessica Rabbit","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"Would Be Cool","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Michael Littman","mailbox":"mlittman"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"rsw@cs.brown.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart_Boundary_MdP9G7i0M2YtQbPlt5MdP9G7i0M2YtMbPlxY\"","MIME-Version":"1.0","Received":"from Messages.8.1.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Thu,  9 Jan 1992 13:30:05 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"438+3"},"date":"694981805","messageID":"MdP9Ghe0M2YtMbPm5Q@thumper.bellcore.com","receivedDate":"694981805","subject":"How MIME looks in AMS (MIME format)","class":"mailcore::MessageHeader","inReplyTo":["9201061308.AA17408@pebbles.cs.brown.edu"],"references":["9201061308.AA17408@pebbles.cs.brown.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Jessica Rabbit","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"Would Be Cool","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/49 b/unittest/data/parser/output/mbox/jwz/49
index f498c86b..562dd35c 100644
--- a/unittest/data/parser/output/mbox/jwz/49
+++ b/unittest/data/parser/output/mbox/jwz/49
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Marshall Rose","mailbox":"mrose@dbc.mtview.ca.us"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.EegBWL:0M2YtE1Y78F\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Fri, 11 Sep 1992 13:34:20 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"948+7"},"date":"978307200","messageID":"8egBWQW0M2YtE1Y7Ea@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: I'd like your opinion","class":"mailcore::MessageHeader","inReplyTo":["7821.715397074@dbc.mtview.ca.us"],"references":["7821.715397074@dbc.mtview.ca.us"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"snapshot 1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/gif","contentDescription":"snapshot 2","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/gif","contentDescription":"snapshot 3","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/gif","contentDescription":"snapshot 4","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"image\/gif","contentDescription":"snapshot 5","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"image\/gif","contentDescription":"snapshot 6","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"13","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"14","mimeType":"image\/gif","contentDescription":"snapshot 7","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"15","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Marshall Rose","mailbox":"mrose@dbc.mtview.ca.us"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.EegBWL:0M2YtE1Y78F\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Fri, 11 Sep 1992 13:34:20 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"948+7"},"date":"716232860","messageID":"8egBWQW0M2YtE1Y7Ea@thumper.bellcore.com","receivedDate":"716232860","subject":"Re: I'd like your opinion","class":"mailcore::MessageHeader","inReplyTo":["7821.715397074@dbc.mtview.ca.us"],"references":["7821.715397074@dbc.mtview.ca.us"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"snapshot 1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/gif","contentDescription":"snapshot 2","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/gif","contentDescription":"snapshot 3","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/gif","contentDescription":"snapshot 4","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"image\/gif","contentDescription":"snapshot 5","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"image\/gif","contentDescription":"snapshot 6","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"13","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"14","mimeType":"image\/gif","contentDescription":"snapshot 7","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"15","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/52 b/unittest/data/parser/output/mbox/jwz/52
index 3e22edf5..79870b63 100644
--- a/unittest/data/parser/output/mbox/jwz/52
+++ b/unittest/data/parser/output/mbox/jwz/52
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"Info-Mac-Request@sumex-aim.stanford.edu"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"Info-Mac-Digest\"","Lines":"1958","Originator":"macmod@camis.Stanford.EDU","Distribution":"world","Approved":"info-mac@sumex-aim.stanford.edu","Followup-To":"comp.sys.mac.digest","NNTP-Posting-Host":"camis.stanford.edu","Newsgroups":"comp.sys.mac.digest","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!camis.Stanford.EDU!macmod","Organization":"The Info-Mac Network"},"date":"978307200","messageID":"3nlr36$t2p@nntp.Stanford.EDU","receivedDate":"978307200","subject":"Info-Mac Digest V13 #50","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"Info-Mac@sumex-aim.stanford.edu"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"2","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"4","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"5","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"6","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"7","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"8","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"9","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"10","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"11","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"extraHeaders":{"Description":"eXpress enables you to pop-up the Process menu (the \"System"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"12","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"13","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"14","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"15","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"16","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"17","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"18","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"19","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"20","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"21","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"22","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"23","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"24","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"25","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"26","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"27","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"28","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"29","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"30","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"31","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"32","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"33","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"34","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"35","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"36","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"37","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"38","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"39","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"40","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"41","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"42","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"43","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"44","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"45","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"46","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"47","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"48","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"49","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"50","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"51","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"52","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"53","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"54","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"55","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"56","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"57","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"58","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"59","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"60","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"61","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"62","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"63","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"64","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"65","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"66","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"67","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"68","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"69","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"70","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"71","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"72","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"73","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"74","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"75","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"76","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"77","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"Info-Mac-Request@sumex-aim.stanford.edu"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"Info-Mac-Digest\"","Lines":"1958","Originator":"macmod@camis.Stanford.EDU","Distribution":"world","Approved":"info-mac@sumex-aim.stanford.edu","Followup-To":"comp.sys.mac.digest","NNTP-Posting-Host":"camis.stanford.edu","Newsgroups":"comp.sys.mac.digest","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!camis.Stanford.EDU!macmod","Organization":"The Info-Mac Network"},"date":"798912422","messageID":"3nlr36$t2p@nntp.Stanford.EDU","receivedDate":"798912422","subject":"Info-Mac Digest V13 #50","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"Info-Mac@sumex-aim.stanford.edu"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"2","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"3","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"4","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"5","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"6","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"7","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"8","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"9","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"10","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"11","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"extraHeaders":{"Description":"eXpress enables you to pop-up the Process menu (the \"System"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"12","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"13","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"14","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"15","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"16","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"17","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"18","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"19","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"20","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"21","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"22","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"23","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"24","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"25","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"26","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"27","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"28","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"29","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"30","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"31","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"32","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"33","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"34","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"35","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"36","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"37","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"38","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"39","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"40","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"41","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"42","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"43","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"44","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"45","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"46","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"47","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"48","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"49","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"50","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"51","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"52","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"53","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"54","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"55","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"56","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"57","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"58","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"59","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"60","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"61","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"62","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"63","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"64","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"65","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"66","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"67","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"68","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"69","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"70","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"71","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"72","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"73","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"74","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"75","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"76","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"77","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/53 b/unittest/data/parser/output/mbox/jwz/53
index 6f35b55f..297fe2b9 100644
--- a/unittest/data/parser/output/mbox/jwz/53
+++ b/unittest/data/parser/output/mbox/jwz/53
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"lassehp@imv.aau.dk"},"extraHeaders":{"Content-Type":"text\/plain; charset=iso-8859-1","Xref":"flop.mcom.com comp.mail.mime:5999 comp.mail.sendmail:20460 comp.unix.aux:21837","Lines":"49","NNTP-Posting-Host":"ratatosk.imv.aau.dk","Newsgroups":"comp.mail.mime,comp.mail.sendmail,comp.unix.aux","Content-Transfer-Encoding":"8bit","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!swrinde!pipex!sunic!sunic.sunet.se!news.uni-c.dk!news.daimi.aau.dk!imv.aau.dk!ratatosk.imv.aau.dk!user","Organization":"Information & Media Science"},"date":"978307200","messageID":"lassehp-0705951521330001@ratatosk.imv.aau.dk","receivedDate":"978307200","subject":"SOLVED: MIME linewrap => A\/UX Sendmail 8.6.9 discarding after CRLF.CRLF","class":"mailcore::MessageHeader","references":["lassehp-0405951834530001@ratatosk.imv.aau.dk"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"iso-8859-1","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"lassehp@imv.aau.dk"},"extraHeaders":{"Content-Type":"text\/plain; charset=iso-8859-1","Xref":"flop.mcom.com comp.mail.mime:5999 comp.mail.sendmail:20460 comp.unix.aux:21837","Lines":"49","NNTP-Posting-Host":"ratatosk.imv.aau.dk","Newsgroups":"comp.mail.mime,comp.mail.sendmail,comp.unix.aux","Content-Transfer-Encoding":"8bit","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!swrinde!pipex!sunic!sunic.sunet.se!news.uni-c.dk!news.daimi.aau.dk!imv.aau.dk!ratatosk.imv.aau.dk!user","Organization":"Information & Media Science"},"date":"799852893","messageID":"lassehp-0705951521330001@ratatosk.imv.aau.dk","receivedDate":"799852893","subject":"SOLVED: MIME linewrap => A\/UX Sendmail 8.6.9 discarding after CRLF.CRLF","class":"mailcore::MessageHeader","references":["lassehp-0405951834530001@ratatosk.imv.aau.dk"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"iso-8859-1","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/56 b/unittest/data/parser/output/mbox/jwz/56
index 4d508d5f..114207f9 100644
--- a/unittest/data/parser/output/mbox/jwz/56
+++ b/unittest/data/parser/output/mbox/jwz/56
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Brad Huntting","mailbox":"huntting@advtech.uswest.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Brad Huntting","mailbox":"huntting@advtech.uswest.com"},"extraHeaders":{"Return-Path":"<huntting@advtech.uswest.com>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.4elpQlO23F868cEkpa\"","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA18744> for nsb; Mon, 28 Sep 92 15:04:32 EDT","Mime-Version":"1.0","X-Andrew-Message-Size":"648+1"},"date":"978307200","messageID":"gelpQlq23F86McEkxs@futureworld","receivedDate":"978307200","subject":"Fwd: test of weather","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Weather map","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Brad Huntting","mailbox":"huntting@advtech.uswest.com"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Brad Huntting","mailbox":"huntting@advtech.uswest.com"},"extraHeaders":{"Return-Path":"<huntting@advtech.uswest.com>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.4elpQlO23F868cEkpa\"","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA18744> for nsb; Mon, 28 Sep 92 15:04:32 EDT","Mime-Version":"1.0","X-Andrew-Message-Size":"648+1"},"date":"717707057","messageID":"gelpQlq23F86McEkxs@futureworld","receivedDate":"717707057","subject":"Fwd: test of weather","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"Weather map","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/58 b/unittest/data/parser/output/mbox/jwz/58
index ba0337d5..168c1117 100644
--- a/unittest/data/parser/output/mbox/jwz/58
+++ b/unittest/data/parser/output/mbox/jwz/58
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Shlomi Fish","mailbox":"shlomi@Medusa.Cortext.co.il"}]},"from":{"class":"mailcore::Address","displayName":"Vladim\u00edr Solnick\u00fd","mailbox":"vs@utia.cas.cz"},"extraHeaders":{"Disposition-Notification-To":"vs+disposition@utia.cas.cz","X-Chameleon-Return-To":"vs+reading@utia.cas.cz","X-Confirm-Delivery-To":"vs+delivery@utia.cas.cz","Acknowledge-To":"vs+delivery@utia.cas.cz","Return-Receipt-To":"vs+delivery@utia.cas.cz","X-Confirm-Reading-To":"vs+reading@utia.cas.cz","Content-Type":"TEXT\/PLAIN; charset=ISO-8859-2","Lines":"35","X-Postal-Address":"\u00daTIA AV \u010cR; Pod vod\u00e1renskou v\u011b\u017e\u00ed 4; 182 08  Praha 8-Libe\u0148; Czech Republic","NNTP-Posting-Host":"visla.utia.cas.cz","Newsgroups":"comp.mail.mime","Transport-Options":"\/delivery \/return","Content-Transfer-Encoding":"8BIT","Mime-Version":"1.0","Path":"tera.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!news.mathworks.com!nntp.primenet.com!uunet!inXS.uu.net!voskovec.radio.cz!visla.utia.cas.cz!vs","Organization":"Institute of Information Theory and Automation (UTIA AV CR)","Read-Receipt-To":"vs+reading@utia.cas.cz","Organizace":"\u00dastav teorie informace a automatizace AV \u010cR (\u00daTIA)"},"date":"978307200","messageID":"Pine.HPP.3.94.1.960713165148.28138A-100000@visla.utia.cas.cz","receivedDate":"978307200","subject":"Re: Sending a Hebrew message with sendmail","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bc. Vladim\u00edr Solnick\u00fd","mailbox":"vs@utia.cas.cz"}]},"inReplyTo":["4s36v9$gi0@news.NetVision.net.il"],"references":["4s36v9$gi0@news.NetVision.net.il"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"ISO-8859-2","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Shlomi Fish","mailbox":"shlomi@Medusa.Cortext.co.il"}]},"from":{"class":"mailcore::Address","displayName":"Vladim\u00edr Solnick\u00fd","mailbox":"vs@utia.cas.cz"},"extraHeaders":{"Disposition-Notification-To":"vs+disposition@utia.cas.cz","X-Chameleon-Return-To":"vs+reading@utia.cas.cz","X-Confirm-Delivery-To":"vs+delivery@utia.cas.cz","Acknowledge-To":"vs+delivery@utia.cas.cz","Return-Receipt-To":"vs+delivery@utia.cas.cz","X-Confirm-Reading-To":"vs+reading@utia.cas.cz","Content-Type":"TEXT\/PLAIN; charset=ISO-8859-2","Lines":"35","X-Postal-Address":"\u00daTIA AV \u010cR; Pod vod\u00e1renskou v\u011b\u017e\u00ed 4; 182 08  Praha 8-Libe\u0148; Czech Republic","NNTP-Posting-Host":"visla.utia.cas.cz","Newsgroups":"comp.mail.mime","Transport-Options":"\/delivery \/return","Content-Transfer-Encoding":"8BIT","Mime-Version":"1.0","Path":"tera.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!news.mathworks.com!nntp.primenet.com!uunet!inXS.uu.net!voskovec.radio.cz!visla.utia.cas.cz!vs","Organization":"Institute of Information Theory and Automation (UTIA AV CR)","Read-Receipt-To":"vs+reading@utia.cas.cz","Organizace":"\u00dastav teorie informace a automatizace AV \u010cR (\u00daTIA)"},"date":"837269935","messageID":"Pine.HPP.3.94.1.960713165148.28138A-100000@visla.utia.cas.cz","receivedDate":"837269935","subject":"Re: Sending a Hebrew message with sendmail","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Bc. Vladim\u00edr Solnick\u00fd","mailbox":"vs@utia.cas.cz"}]},"inReplyTo":["4s36v9$gi0@news.NetVision.net.il"],"references":["4s36v9$gi0@news.NetVision.net.il"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"ISO-8859-2","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/59 b/unittest/data/parser/output/mbox/jwz/59
index f6c017bd..586b2b06 100644
--- a/unittest/data/parser/output/mbox/jwz/59
+++ b/unittest/data/parser/output/mbox/jwz/59
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@strumpet.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Lou Montulli","mailbox":"montulli@mozilla.com"},"extraHeaders":{"Return-Path":"montulli@mozilla.com","Content-Type":"multipart\/mixed; boundary=\"------------FF6ABD31DF\"","MIME-Version":"1.0","X-Mailer":"Mozilla 3.0b4 (X11; U; IRIX 5.3 IP22)","Received":"from strumpet.mcom.com (strumpet.mcom.com [205.217.236.99]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id LAA15536 for <jwz@urchin.mcom.com>; Tue, 14 May 1996 11:00:09 -0700","Organization":"Mozilla World Headquarters"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"montulli@strumpet.mcom.com"},"messageID":"3198C9E7.3F54@mozilla.com","receivedDate":"978307200","subject":"[Fwd: Netsurfer Digest: Vol. 02, #14 (HTML)]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"editor-bounce@netsurf.com"},"extraHeaders":{"X-Authentication-Warning":"zocalo.net: shrike set sender to editor-bounce@netsurf.com using -f","Apparently-To":"<montulli@strumpet.mcom.com>","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by strumpet.mcom.com (8.6.10\/8.6.9) with ESMTP id JAA13279 for <montulli@strumpet.mcom.com>; Tue, 14 May 1996 09:20:18 -0700","Precedence":"bulk"},"date":"978307200","messageID":"199605141620.JAA02498@zocalo.net","receivedDate":"978307200","subject":"Netsurfer Digest: Vol. 02, #14 (HTML)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/html","class":"mailcore::Attachment"}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@strumpet.mcom.com"}]},"from":{"class":"mailcore::Address","displayName":"Lou Montulli","mailbox":"montulli@mozilla.com"},"extraHeaders":{"Return-Path":"montulli@mozilla.com","Content-Type":"multipart\/mixed; boundary=\"------------FF6ABD31DF\"","MIME-Version":"1.0","X-Mailer":"Mozilla 3.0b4 (X11; U; IRIX 5.3 IP22)","Received":"from strumpet.mcom.com (strumpet.mcom.com [205.217.236.99]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id LAA15536 for <jwz@urchin.mcom.com>; Tue, 14 May 1996 11:00:09 -0700","Organization":"Mozilla World Headquarters"},"date":"832096743","sender":{"class":"mailcore::Address","mailbox":"montulli@strumpet.mcom.com"},"messageID":"3198C9E7.3F54@mozilla.com","receivedDate":"832096743","subject":"[Fwd: Netsurfer Digest: Vol. 02, #14 (HTML)]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"editor-bounce@netsurf.com"},"extraHeaders":{"X-Authentication-Warning":"zocalo.net: shrike set sender to editor-bounce@netsurf.com using -f","Apparently-To":"<montulli@strumpet.mcom.com>","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by strumpet.mcom.com (8.6.10\/8.6.9) with ESMTP id JAA13279 for <montulli@strumpet.mcom.com>; Tue, 14 May 1996 09:20:18 -0700","Precedence":"bulk"},"date":"832090812","messageID":"199605141620.JAA02498@zocalo.net","receivedDate":"832090812","subject":"Netsurfer Digest: Vol. 02, #14 (HTML)","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/html","class":"mailcore::Attachment"}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/6 b/unittest/data/parser/output/mbox/jwz/6
index a1405e0b..f6169805 100644
--- a/unittest/data/parser/output/mbox/jwz/6
+++ b/unittest/data/parser/output/mbox/jwz/6
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ysato@etl.go.jp"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.4eAAtte0M2Yt8fF9oM\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Sat,  6 Jun 1992 10:42:04 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"434+4"},"date":"978307200","messageID":"MeAAuwe0M2YtEfF9xR@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: MIME example in VIN","class":"mailcore::MessageHeader","inReplyTo":["9206052121.AA02633@etlibs.etl.go.jp"],"references":["9206052121.AA02633@etlibs.etl.go.jp"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/x-xwd","contentDescription":"Your mail to me","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/x-xwd","contentDescription":"The way that message looked to ME","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"audio\/basic","contentDescription":"Note the use of the audio button..","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/x-xwd","contentDescription":"Reply-in-progress picture","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ysato@etl.go.jp"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.4eAAtte0M2Yt8fF9oM\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Sat,  6 Jun 1992 10:42:04 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"434+4"},"date":"707841724","messageID":"MeAAuwe0M2YtEfF9xR@thumper.bellcore.com","receivedDate":"707841724","subject":"Re: MIME example in VIN","class":"mailcore::MessageHeader","inReplyTo":["9206052121.AA02633@etlibs.etl.go.jp"],"references":["9206052121.AA02633@etlibs.etl.go.jp"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/x-xwd","contentDescription":"Your mail to me","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/x-xwd","contentDescription":"The way that message looked to ME","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"audio\/basic","contentDescription":"Note the use of the audio button..","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/x-xwd","contentDescription":"Reply-in-progress picture","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/60 b/unittest/data/parser/output/mbox/jwz/60
index c21ca8f2..adedd0c1 100644
--- a/unittest/data/parser/output/mbox/jwz/60
+++ b/unittest/data/parser/output/mbox/jwz/60
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Herr Professor dr S...........","mailbox":"heinwvm@xs4all.nl"},"extraHeaders":{"Content-Type":"multipart\/mixed;\u000a\u0009boundary=\"-------------------------------14692623421298\"","Lines":"317","NNTP-Posting-Host":"asd06-05.dial.xs4all.nl","Newsgroups":"alt.revisionism","X-Mailer":"Mozilla 1.1b3 (Windows; I; 16bit)","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!crl.dec.com!caen!usenet.cis.ufl.edu!usenet.eel.ufl.edu!gatech!howland.reston.ans.net!EU.net!sun4nl!hacktic!usenet","Organization":"XS4ALL, networking for the masses"},"date":"978307200","messageID":"3njms4$f42@news.xs4all.nl","receivedDate":"978307200","subject":"Canninefate Settlements Dicovered: Aryan House Boats.....(Summer School)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"iso-8859-1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Herr Professor dr S...........","mailbox":"heinwvm@xs4all.nl"},"extraHeaders":{"Content-Type":"multipart\/mixed;\u000a\u0009boundary=\"-------------------------------14692623421298\"","Lines":"317","NNTP-Posting-Host":"asd06-05.dial.xs4all.nl","Newsgroups":"alt.revisionism","X-Mailer":"Mozilla 1.1b3 (Windows; I; 16bit)","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!crl.dec.com!caen!usenet.cis.ufl.edu!usenet.eel.ufl.edu!gatech!howland.reston.ans.net!EU.net!sun4nl!hacktic!usenet","Organization":"XS4ALL, networking for the masses"},"date":"798842564","messageID":"3njms4$f42@news.xs4all.nl","receivedDate":"798842564","subject":"Canninefate Settlements Dicovered: Aryan House Boats.....(Summer School)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"iso-8859-1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/64 b/unittest/data/parser/output/mbox/jwz/64
index f6775a02..65ea6a75 100644
--- a/unittest/data/parser/output/mbox/jwz/64
+++ b/unittest/data/parser/output/mbox/jwz/64
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mh-mime@dbc.mtview.ca.us"}]},"from":{"class":"mailcore::Address","displayName":"Marshall Rose","mailbox":"mrose@dbc.mtview.ca.us"},"extraHeaders":{"Return-Path":"<mrose@dbc.mtview.ca.us>","Content-Type":"multipart\/mixed; boundary=\"FOOFOO\"","Resent-From":"Marshall Rose <mrose@dbc.mtview.ca.us>","Resent-Date":"Tue, 01 Sep 1992 18:29:38 -0700","Resent-To":"Nathaniel Borenstein <nsb@thumper.bellcore.com>","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA18372> for nsb; Tue, 1 Sep 92 21:31:43 EDT","Mime-Version":"1.0"},"date":"978307200","messageID":"7821.715397074@dbc.mtview.ca.us","receivedDate":"978307200","subject":"I'd like your opinion","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mh-mime@dbc.mtview.ca.us"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Masthead","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"READ-ME","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Disclaimer","class":"mailcore::Attachment"}]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"4","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Technical Article","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Industry Comment","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Applications and Directions","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Ask Dr. SNMP","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Security and Protocols","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Standards","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"13","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Working Group Synopses","class":"mailcore::Attachment"}]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"14","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Activities Calendar","class":"mailcore::Attachment"}]}}]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"6","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Publication Information","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Submissions","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Subscriptions Information","class":"mailcore::Attachment"}]}}]}}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mh-mime@dbc.mtview.ca.us"}]},"from":{"class":"mailcore::Address","displayName":"Marshall Rose","mailbox":"mrose@dbc.mtview.ca.us"},"extraHeaders":{"Return-Path":"<mrose@dbc.mtview.ca.us>","Content-Type":"multipart\/mixed; boundary=\"FOOFOO\"","Resent-From":"Marshall Rose <mrose@dbc.mtview.ca.us>","Resent-Date":"Tue, 01 Sep 1992 18:29:38 -0700","Resent-To":"Nathaniel Borenstein <nsb@thumper.bellcore.com>","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA18372> for nsb; Tue, 1 Sep 92 21:31:43 EDT","Mime-Version":"1.0"},"date":"715397076","messageID":"7821.715397074@dbc.mtview.ca.us","receivedDate":"715397076","subject":"I'd like your opinion","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mh-mime@dbc.mtview.ca.us"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Masthead","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"READ-ME","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Disclaimer","class":"mailcore::Attachment"}]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"4","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Technical Article","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Industry Comment","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Applications and Directions","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Ask Dr. SNMP","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Security and Protocols","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Standards","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"13","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Working Group Synopses","class":"mailcore::Attachment"}]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"14","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Activities Calendar","class":"mailcore::Attachment"}]}}]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"6","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Publication Information","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Submissions","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"text\/richtext","charset":"us-ascii","contentDescription":"Subscriptions Information","class":"mailcore::Attachment"}]}}]}}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/65 b/unittest/data/parser/output/mbox/jwz/65
index c2cdff09..03c63aea 100644
--- a/unittest/data/parser/output/mbox/jwz/65
+++ b/unittest/data/parser/output/mbox/jwz/65
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"info-metamail@thumper.bellcore.com"},{"class":"mailcore::Address","mailbox":"mh-mime@dbc.mtview.ca.us"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Brad Huntting","mailbox":"huntting@advtech.uswest.com"}]},"from":{"class":"mailcore::Address","displayName":"Patrik F\u00a5dltstr\u00a5vm","mailbox":"paf@nada.kth.se"},"extraHeaders":{"Return-Path":"<paf@nada.kth.se>","Content-Type":"TEXT\/PLAIN; charset=ISO-8859-1","Content-Transfer-Encoding":"QUOTED-PRINTABLE","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA10675> for nsb; Sun, 15 Nov 92 09:19:09 EST","Mime-Version":"1.0"},"date":"978307200","messageID":"Pine.3.80.9211151559.B2317-e100000@joker.nada.kth.se","receivedDate":"978307200","subject":"MIME letter with ISO-8859-1","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"ISO-8859-1","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"info-metamail@thumper.bellcore.com"},{"class":"mailcore::Address","mailbox":"mh-mime@dbc.mtview.ca.us"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Brad Huntting","mailbox":"huntting@advtech.uswest.com"}]},"from":{"class":"mailcore::Address","displayName":"Patrik F\u00a5dltstr\u00a5vm","mailbox":"paf@nada.kth.se"},"extraHeaders":{"Return-Path":"<paf@nada.kth.se>","Content-Type":"TEXT\/PLAIN; charset=ISO-8859-1","Content-Transfer-Encoding":"QUOTED-PRINTABLE","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA10675> for nsb; Sun, 15 Nov 92 09:19:09 EST","Mime-Version":"1.0"},"date":"721836599","messageID":"Pine.3.80.9211151559.B2317-e100000@joker.nada.kth.se","receivedDate":"721836599","subject":"MIME letter with ISO-8859-1","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"ISO-8859-1","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/66 b/unittest/data/parser/output/mbox/jwz/66
index 51db859d..19c28403 100644
--- a/unittest/data/parser/output/mbox/jwz/66
+++ b/unittest/data/parser/output/mbox/jwz/66
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"steindle@uts340.univ.trieste.it"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.IfasKPO0M2Yt8whLBn\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Mon,  8 Mar 1993 12:42:53 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"500+3"},"date":"978307200","messageID":"AfasKRC0M2Yt8whLIo@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: MIME, how do you pronounce it?","class":"mailcore::MessageHeader","inReplyTo":["9303081733.AA21435@uts340.univ.trieste.it"],"references":["9303081733.AA21435@uts340.univ.trieste.it"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"audio\/basic","contentDescription":"Hallelujah!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"Distress Calls","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"audio\/basic","contentDescription":"Woowoo!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"steindle@uts340.univ.trieste.it"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.IfasKPO0M2Yt8whLBn\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Mon,  8 Mar 1993 12:42:53 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"500+3"},"date":"731612573","messageID":"AfasKRC0M2Yt8whLIo@thumper.bellcore.com","receivedDate":"731612573","subject":"Re: MIME, how do you pronounce it?","class":"mailcore::MessageHeader","inReplyTo":["9303081733.AA21435@uts340.univ.trieste.it"],"references":["9303081733.AA21435@uts340.univ.trieste.it"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"audio\/basic","contentDescription":"Hallelujah!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"audio\/basic","contentDescription":"Distress Calls","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"audio\/basic","contentDescription":"Woowoo!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/68 b/unittest/data/parser/output/mbox/jwz/68
index 2c05b15c..a56af45f 100644
--- a/unittest/data/parser/output/mbox/jwz/68
+++ b/unittest/data/parser/output/mbox/jwz/68
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"Cat@Pic.net"},"extraHeaders":{"Newsgroups":"alt.romance.chat","Organization":"PICnet"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"Jessica... - jesica.bmp [1\/1]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"Cat@Pic.net"},"extraHeaders":{"Newsgroups":"alt.romance.chat","Organization":"PICnet"},"date":"799193316","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"799193316","subject":"Jessica... - jesica.bmp [1\/1]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/69 b/unittest/data/parser/output/mbox/jwz/69
index 6b607975..002cf972 100644
--- a/unittest/data/parser/output/mbox/jwz/69
+++ b/unittest/data/parser/output/mbox/jwz/69
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Frank Tabor","mailbox":"phranc@inmind.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"----=_NextPart_000_01BB7BF6.E683F700\"","Lines":"369","X-Newsreader":"Microsoft Internet News 4.70.1141","NNTP-Posting-Host":"dial104-203.inmind.net","Newsgroups":"netscape.navigator","Content-Transfer-Encoding":"7bit","Mime-Version":"1.0","Path":"secnews2.netscape.com!secnews.netscape.com!bhern@netscape.com","Organization":"In Mind International"},"date":"978307200","messageID":"01bb7c18$6d959700$cb68b1cc@phranc.inmind.com","receivedDate":"978307200","subject":"Re: Win95, Netscape and File Types","class":"mailcore::MessageHeader","references":["31FAD463.4282@mindspring.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"ISO-8859-1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/html","charset":"ISO-8859-1","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"0","mimeType":"application\/octet-stream","contentDescription":"filetype (LView Pro Image File)","class":"mailcore::Attachment","filename":"filetype.jpg"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Frank Tabor","mailbox":"phranc@inmind.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"----=_NextPart_000_01BB7BF6.E683F700\"","Lines":"369","X-Newsreader":"Microsoft Internet News 4.70.1141","NNTP-Posting-Host":"dial104-203.inmind.net","Newsgroups":"netscape.navigator","Content-Transfer-Encoding":"7bit","Mime-Version":"1.0","Path":"secnews2.netscape.com!secnews.netscape.com!bhern@netscape.com","Organization":"In Mind International"},"date":"838512209","messageID":"01bb7c18$6d959700$cb68b1cc@phranc.inmind.com","receivedDate":"838512209","subject":"Re: Win95, Netscape and File Types","class":"mailcore::MessageHeader","references":["31FAD463.4282@mindspring.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"ISO-8859-1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"text\/html","charset":"ISO-8859-1","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"0","mimeType":"application\/octet-stream","contentDescription":"filetype (LView Pro Image File)","class":"mailcore::Attachment","filename":"filetype.jpg"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/70 b/unittest/data/parser/output/mbox/jwz/70
index 824607d6..a1f59912 100644
--- a/unittest/data/parser/output/mbox/jwz/70
+++ b/unittest/data/parser/output/mbox/jwz/70
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------outer\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 2.0 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31B0F5D1.41C6@netscape.com","receivedDate":"978307200","subject":"multipart\/alternative 2","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"3","mimeType":"text\/plain","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"text\/richtext","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/enriched","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"text\/html","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/something-you-dont-know","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"8","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"10","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/html","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"text\/x-barf","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"9","mimeType":"application\/spankme","contentDescription":"you shouldn't be seeing this either","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"2","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------outer\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 2.0 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"833680849","messageID":"31B0F5D1.41C6@netscape.com","receivedDate":"833680849","subject":"multipart\/alternative 2","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"3","mimeType":"text\/plain","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"text\/richtext","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/enriched","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"text\/html","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/something-you-dont-know","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"8","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"10","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/html","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"text\/x-barf","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"9","mimeType":"application\/spankme","contentDescription":"you shouldn't be seeing this either","class":"mailcore::Attachment"}]}},{"partType":"single","uniqueID":"2","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/71 b/unittest/data/parser/output/mbox/jwz/71
index a7956a63..c1857888 100644
--- a/unittest/data/parser/output/mbox/jwz/71
+++ b/unittest/data/parser/output/mbox/jwz/71
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------outer\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 2.0 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"31B0F5D1.41C6@netscape.com","receivedDate":"978307200","subject":"multipart\/alternative","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment","filename":"album-list.txt"},{"partType":"single","uniqueID":"2","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment","filename":"album-list.html"},{"partType":"single","uniqueID":"3","mimeType":"application\/postscript","inlineAttachment":"1","class":"mailcore::Attachment","filename":"album-list.ps"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"------------outer\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 2.0 (X11; U; IRIX 5.3 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"833680849","messageID":"31B0F5D1.41C6@netscape.com","receivedDate":"833680849","subject":"multipart\/alternative","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"iso-8859-1","inlineAttachment":"1","class":"mailcore::Attachment","filename":"album-list.txt"},{"partType":"single","uniqueID":"2","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment","filename":"album-list.html"},{"partType":"single","uniqueID":"3","mimeType":"application\/postscript","inlineAttachment":"1","class":"mailcore::Attachment","filename":"album-list.ps"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/72 b/unittest/data/parser/output/mbox/jwz/72
index fa911c43..a8b93e18 100644
--- a/unittest/data/parser/output/mbox/jwz/72
+++ b/unittest/data/parser/output/mbox/jwz/72
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Chromosome Terror","mailbox":"abrdlher@reading.ac.uk"},"extraHeaders":{"Content-ID":"<Pine.SOL.3.91.950426210608.18431B@suma3.reading.ac.uk>","Content-Type":"MULTIPART\/MIXED; BOUNDARY=---Multi-Part-Message-Level-1-1-18170","Lines":"43","NNTP-Posting-Host":"suma3-e2.reading.ac.uk","Newsgroups":"soc.culture.spain","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!swrinde!pipex!sunsite.doc.ic.ac.uk!sunews!suma3!abrdlher","Organization":"University of Reading, U.K."},"date":"978307200","messageID":"Pine.SOL.3.91.950426210608.18431A-110000@suma3.reading.ac.uk","receivedDate":"978307200","subject":"Alternative medicine","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"Pine.SOL.3.91.950426210608.18431C@suma3.reading.ac.uk","partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Pavilion Subscriber","mailbox":"Pavilion_sub@pavilion.co.uk"}]},"from":{"class":"mailcore::Address","displayName":"Chromosome Terror","mailbox":"J.I.De-las-Heras@reading.ac.uk"},"extraHeaders":{"Received":"from suma3.rdg.ac.uk by sums1.rdg.ac.uk with SMTP - Local (PP);\u000a          Fri, 21 Apr 1995 12:28:34 +0100","content-length":"346"},"date":"978307200","messageID":"Pine.SOL.3.91.950421122449.28779E-100000@suma3.reading.ac.uk","receivedDate":"978307200","subject":"Re: Alternative Medicine ","class":"mailcore::MessageHeader","inReplyTo":["Pavilion_sub-2004950803380001@line07.gunn-du.pavilion.co.uk"]},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"}}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Chromosome Terror","mailbox":"abrdlher@reading.ac.uk"},"extraHeaders":{"Content-ID":"<Pine.SOL.3.91.950426210608.18431B@suma3.reading.ac.uk>","Content-Type":"MULTIPART\/MIXED; BOUNDARY=---Multi-Part-Message-Level-1-1-18170","Lines":"43","NNTP-Posting-Host":"suma3-e2.reading.ac.uk","Newsgroups":"soc.culture.spain","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!gatech!swrinde!pipex!sunsite.doc.ic.ac.uk!sunews!suma3!abrdlher","Organization":"University of Reading, U.K."},"date":"798926856","messageID":"Pine.SOL.3.91.950426210608.18431A-110000@suma3.reading.ac.uk","receivedDate":"798926856","subject":"Alternative medicine","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"Pine.SOL.3.91.950426210608.18431C@suma3.reading.ac.uk","partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Pavilion Subscriber","mailbox":"Pavilion_sub@pavilion.co.uk"}]},"from":{"class":"mailcore::Address","displayName":"Chromosome Terror","mailbox":"J.I.De-las-Heras@reading.ac.uk"},"extraHeaders":{"Received":"from suma3.rdg.ac.uk by sums1.rdg.ac.uk with SMTP - Local (PP);\u000a          Fri, 21 Apr 1995 12:28:34 +0100","content-length":"346"},"date":"798463730","messageID":"Pine.SOL.3.91.950421122449.28779E-100000@suma3.reading.ac.uk","receivedDate":"798463730","subject":"Re: Alternative Medicine ","class":"mailcore::MessageHeader","inReplyTo":["Pavilion_sub-2004950803380001@line07.gunn-du.pavilion.co.uk"]},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/73 b/unittest/data/parser/output/mbox/jwz/73
index f605c6c4..d14df907 100644
--- a/unittest/data/parser/output/mbox/jwz/73
+++ b/unittest/data/parser/output/mbox/jwz/73
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.10@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.10.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.10.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.10@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.10.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.10.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/74 b/unittest/data/parser/output/mbox/jwz/74
index 47ffbb19..3526988f 100644
--- a/unittest/data/parser/output/mbox/jwz/74
+++ b/unittest/data/parser/output/mbox/jwz/74
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.10@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.10.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.10.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.10@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.10.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.10.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/75 b/unittest/data/parser/output/mbox/jwz/75
index 6cf6d1f3..86a9aa7b 100644
--- a/unittest/data/parser/output/mbox/jwz/75
+++ b/unittest/data/parser/output/mbox/jwz/75
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"izzy@nugget.scr.atm.com"},"extraHeaders":{"Return-Path":"izzy@nugget.scr.atm.com","Content-Type":"multipart\/related;\u000a   boundary=\"=_03tW34g.bO1996u.N16d000A.r06Y.42:0047e7\";\u000a   type=\"text\/html\";\u000a   start-info=\"X-twg-cidlinking-V1.2\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","Content-Transfer-Encoding":"7bit","X-Mailer":"Emissary V2.00, by Attachmate Corp.","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id JAA03193 for <jwz@urchin.mcom.com>; Mon, 3 Jun 1996 09:48:13 -0700","Content-Length":"6555","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"19960603164232.izzy@scr.atm.com","receivedDate":"978307200","subject":"RE[4]: your generated HTML","class":"mailcore::MessageHeader","inReplyTo":["31AEE9BD.59E2@netscape.com"],"references":["199605261926.AA283048804@merle.acns.nwu.edu","19960527225319.izzy@scr.atm.com","19960528160415.izzy@scr.atm.com","19960530190556.izzy@scr.atm.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"ISO-8859-1","class":"mailcore::Attachment"},{"contentID":"0.19960603164233.izzy@scr.atm.com","partType":"single","uniqueID":"1","mimeType":"image\/gif","inlineAttachment":"1","contentDescription":"The Sender's Signature","class":"mailcore::Attachment","filename":"SIG.GIF"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"izzy@nugget.scr.atm.com"},"extraHeaders":{"Return-Path":"izzy@nugget.scr.atm.com","Content-Type":"multipart\/related;\u000a   boundary=\"=_03tW34g.bO1996u.N16d000A.r06Y.42:0047e7\";\u000a   type=\"text\/html\";\u000a   start-info=\"X-twg-cidlinking-V1.2\"","MIME-Version":"1.0","X-Mozilla-Status":"0011","Content-Transfer-Encoding":"7bit","X-Mailer":"Emissary V2.00, by Attachmate Corp.","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id JAA03193 for <jwz@urchin.mcom.com>; Mon, 3 Jun 1996 09:48:13 -0700","Content-Length":"6555","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"833820152","messageID":"19960603164232.izzy@scr.atm.com","receivedDate":"833820152","subject":"RE[4]: your generated HTML","class":"mailcore::MessageHeader","inReplyTo":["31AEE9BD.59E2@netscape.com"],"references":["199605261926.AA283048804@merle.acns.nwu.edu","19960527225319.izzy@scr.atm.com","19960528160415.izzy@scr.atm.com","19960530190556.izzy@scr.atm.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"ISO-8859-1","class":"mailcore::Attachment"},{"contentID":"0.19960603164233.izzy@scr.atm.com","partType":"single","uniqueID":"1","mimeType":"image\/gif","inlineAttachment":"1","contentDescription":"The Sender's Signature","class":"mailcore::Attachment","filename":"SIG.GIF"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/76 b/unittest/data/parser/output/mbox/jwz/76
index 0854e009..155a8209 100644
--- a/unittest/data/parser/output/mbox/jwz/76
+++ b/unittest/data/parser/output/mbox/jwz/76
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Paul Phillips","mailbox":"paulp@go2net.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"FCC":"\/u\/jwz\/nsmail\/Inbox","Content-Type":"multipart\/mixed;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","X-Mailer":"Mozilla 3.01 (X11; I; IRIX 6.2 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"3341AE7C.665F552F@netscape.com","receivedDate":"978307200","subject":"Netscape Announces Theme Park Plans","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.1@netscape.com","partType":"single","uniqueID":"1","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment","filename":"story12.htm"},{"contentID":"3341AE7C.665F552F.2@netscape.com","partType":"single","uniqueID":"2","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"netscape1223_communicator.gif"},{"contentID":"3341AE7C.665F552F.3@netscape.com","partType":"single","uniqueID":"3","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"inbanner.gif"},{"contentID":"3341AE7C.665F552F.4@netscape.com","partType":"single","uniqueID":"4","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"topnews.gif"},{"contentID":"3341AE7C.665F552F.5@netscape.com","partType":"single","uniqueID":"5","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"headline.gif"},{"contentID":"3341AE7C.665F552F.6@netscape.com","partType":"single","uniqueID":"6","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"plans.GIF"},{"contentID":"3341AE7C.665F552F.7@netscape.com","partType":"single","uniqueID":"7","mimeType":"image\/jpeg","inlineAttachment":"1","class":"mailcore::Attachment","filename":"pirates.jpg"},{"contentID":"3341AE7C.665F552F.8@netscape.com","partType":"single","uniqueID":"8","mimeType":"image\/jpeg","inlineAttachment":"1","class":"mailcore::Attachment","filename":"stockcoaster.jpg"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Paul Phillips","mailbox":"paulp@go2net.com"}]},"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"FCC":"\/u\/jwz\/nsmail\/Inbox","Content-Type":"multipart\/mixed;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","X-Mailer":"Mozilla 3.01 (X11; I; IRIX 6.2 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"859942524","messageID":"3341AE7C.665F552F@netscape.com","receivedDate":"859942524","subject":"Netscape Announces Theme Park Plans","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.1@netscape.com","partType":"single","uniqueID":"1","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment","filename":"story12.htm"},{"contentID":"3341AE7C.665F552F.2@netscape.com","partType":"single","uniqueID":"2","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"netscape1223_communicator.gif"},{"contentID":"3341AE7C.665F552F.3@netscape.com","partType":"single","uniqueID":"3","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"inbanner.gif"},{"contentID":"3341AE7C.665F552F.4@netscape.com","partType":"single","uniqueID":"4","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"topnews.gif"},{"contentID":"3341AE7C.665F552F.5@netscape.com","partType":"single","uniqueID":"5","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"headline.gif"},{"contentID":"3341AE7C.665F552F.6@netscape.com","partType":"single","uniqueID":"6","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"plans.GIF"},{"contentID":"3341AE7C.665F552F.7@netscape.com","partType":"single","uniqueID":"7","mimeType":"image\/jpeg","inlineAttachment":"1","class":"mailcore::Attachment","filename":"pirates.jpg"},{"contentID":"3341AE7C.665F552F.8@netscape.com","partType":"single","uniqueID":"8","mimeType":"image\/jpeg","inlineAttachment":"1","class":"mailcore::Attachment","filename":"stockcoaster.jpg"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/77 b/unittest/data/parser/output/mbox/jwz/77
index 5f2bb7ef..c06b6d9b 100644
--- a/unittest/data/parser/output/mbox/jwz/77
+++ b/unittest/data/parser/output/mbox/jwz/77
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.4@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.4.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.4.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.4@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.4.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.4.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/78 b/unittest/data/parser/output/mbox/jwz/78
index fc78768e..0d258f40 100644
--- a/unittest/data/parser/output/mbox/jwz/78
+++ b/unittest/data/parser/output/mbox/jwz/78
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.5@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.5.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.5.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.5@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.5.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.5.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/79 b/unittest/data/parser/output/mbox/jwz/79
index 297575db..cc814988 100644
--- a/unittest/data/parser/output/mbox/jwz/79
+++ b/unittest/data/parser/output/mbox/jwz/79
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.6@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.6.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"http:\/\/www.netscape.com\/people\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.6.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.6@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.6.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"http:\/\/www.netscape.com\/people\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.6.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/80 b/unittest/data/parser/output/mbox/jwz/80
index 73f62138..01d1c2d9 100644
--- a/unittest/data/parser/output/mbox/jwz/80
+++ b/unittest/data/parser/output/mbox/jwz/80
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.7@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.7.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.7.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.7@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.7.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.7.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/81 b/unittest/data/parser/output/mbox/jwz/81
index ab18f4b9..db652fa4 100644
--- a/unittest/data/parser/output/mbox/jwz/81
+++ b/unittest/data/parser/output/mbox/jwz/81
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.8@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.8.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"http:\/\/www.netscape.com\/people\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.8.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.8@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.8.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"http:\/\/www.netscape.com\/people\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.8.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/82 b/unittest/data/parser/output/mbox/jwz/82
index 52395554..338a6443 100644
--- a/unittest/data/parser/output/mbox/jwz/82
+++ b/unittest/data/parser/output/mbox/jwz/82
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"978307200","messageID":"3341AE7C.665F552F.9@netscape.com","receivedDate":"978307200","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.9.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.9.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"},"extraHeaders":{"Content-Type":"multipart\/related;\u000a    boundary=\"------------25F71003F6609771F5544030\"","MIME-Version":"1.0","Newsgroup":"alt.fan.jwz"},"date":"859942524","messageID":"3341AE7C.665F552F.9@netscape.com","receivedDate":"859942524","subject":"multipart\/related MHTML test case","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"contentID":"3341AE7C.665F552F.9.part1@netscape.com","partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"us-ascii","inlineAttachment":"1","contentLocation":"jwz\/index.html","class":"mailcore::Attachment"},{"contentID":"3341AE7C.665F552F.9.part2@netscape.com","partType":"single","uniqueID":"1","mimeType":"image\/jpeg","contentLocation":"http:\/\/www.netscape.com\/people\/jwz\/jwz6.jpg","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/83 b/unittest/data/parser/output/mbox/jwz/83
index e7ffb7bc..aa9afb46 100644
--- a/unittest/data/parser/output/mbox/jwz/83
+++ b/unittest/data/parser/output/mbox/jwz/83
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Chuck Simmons","mailbox":"chrlsim@futureone.com"},"extraHeaders":{"Return-Path":"<chrlsim@futureone.com>","Content-Type":"multipart\/mixed; boundary=\"------------746A59DD382995F41B0947E\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.01 (X11; U; Linux 2.0.0 i486)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Messaging Server 3.0)  with SMTP id AAA8166\u000a          for <jwz@dredd.mcom.com>; Mon, 18 Aug 1997 21:13:55 -0700","Content-Length":"747282","Organization":"Organized? You jest!"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"chrlsim@futureone.com"},"messageID":"33F91BEB.10E2A9D5@futureone.com","receivedDate":"978307200","subject":"3.01 MIME prob message [Fwd: communicator 4.01  a conference problem]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"chrlsim@futureone.com"}]},"from":{"class":"mailcore::Address","displayName":"NIRI ELLERT","mailbox":"nirie3@gezernet.co.il"},"extraHeaders":{"X-Mailer":"Mozilla 4.01 [en] (Win95; I)","Received":"from gezer1.gezernet.co.il (gezer1.gezernet.co.il [192.116.212.2]) by future.futureone.com (8.8.2\/8.8.0) with ESMTP id OAA19067 for <chrlsim@futureone.com>; Mon, 18 Aug 1997 14:50:46 -0700 (MST)","Organization":"GEZERNET","X-Priority":"3 (Normal)"},"date":"978307200","messageID":"33F8C032.C5DC0CA2@gezernet.co.il","receivedDate":"978307200","subject":"communicator 4.01  a conference problem","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nirie3@gezernet.co.il"}]}},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"2","mimeType":"text\/html","charset":"us-ascii","class":"mailcore::Attachment"},{"contentID":"part1.33F8C032.E4CBCE7F@gezernet.co.il","partType":"single","uniqueID":"3","mimeType":"image\/tiff","inlineAttachment":"1","class":"mailcore::Attachment","filename":"C:\u00a5win95\u00a5TEMP\u00a5nsmailRJ.tiff"}]}}]}}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jamie Zawinski","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","displayName":"Chuck Simmons","mailbox":"chrlsim@futureone.com"},"extraHeaders":{"Return-Path":"<chrlsim@futureone.com>","Content-Type":"multipart\/mixed; boundary=\"------------746A59DD382995F41B0947E\"","MIME-Version":"1.0","X-Mozilla-Status":"0001","X-Mailer":"Mozilla 3.01 (X11; U; Linux 2.0.0 i486)","Received":"from maleman.mcom.com ([198.93.92.3]) by dredd.mcom.com\u000a          (Netscape Messaging Server 3.0)  with SMTP id AAA8166\u000a          for <jwz@dredd.mcom.com>; Mon, 18 Aug 1997 21:13:55 -0700","Content-Length":"747282","Organization":"Organized? You jest!"},"date":"871963627","sender":{"class":"mailcore::Address","mailbox":"chrlsim@futureone.com"},"messageID":"33F91BEB.10E2A9D5@futureone.com","receivedDate":"871963627","subject":"3.01 MIME prob message [Fwd: communicator 4.01  a conference problem]","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"message","header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"chrlsim@futureone.com"}]},"from":{"class":"mailcore::Address","displayName":"NIRI ELLERT","mailbox":"nirie3@gezernet.co.il"},"extraHeaders":{"X-Mailer":"Mozilla 4.01 [en] (Win95; I)","Received":"from gezer1.gezernet.co.il (gezer1.gezernet.co.il [192.116.212.2]) by future.futureone.com (8.8.2\/8.8.0) with ESMTP id OAA19067 for <chrlsim@futureone.com>; Mon, 18 Aug 1997 14:50:46 -0700 (MST)","Organization":"GEZERNET","X-Priority":"3 (Normal)"},"date":"871940146","messageID":"33F8C032.C5DC0CA2@gezernet.co.il","receivedDate":"871940146","subject":"communicator 4.01  a conference problem","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nirie3@gezernet.co.il"}]}},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"},{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"2","mimeType":"text\/html","charset":"us-ascii","class":"mailcore::Attachment"},{"contentID":"part1.33F8C032.E4CBCE7F@gezernet.co.il","partType":"single","uniqueID":"3","mimeType":"image\/tiff","inlineAttachment":"1","class":"mailcore::Attachment","filename":"C:\u00a5win95\u00a5TEMP\u00a5nsmailRJ.tiff"}]}}]}}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/84 b/unittest/data/parser/output/mbox/jwz/84
index 15c6cbd0..8b863507 100644
--- a/unittest/data/parser/output/mbox/jwz/84
+++ b/unittest/data/parser/output/mbox/jwz/84
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"izzy@scr.atm.com"},"extraHeaders":{"Return-Path":"izzy@scr.atm.com","Content-Type":"multipart\/related;\u000a   boundary=\"=_09tW13g.bO1996u.N01d000A.r02Y.33:0018d7\";\u000a   type=\"text\/html\";\u000a   start-info=\"X-twg-cidlinking-V1.2\"","MIME-Version":"1.0","Status":"U","X-Mozilla-Status":"0001","X-UIDL":"823829838.001","Content-Transfer-Encoding":"7bit","X-Mailer":"Emissary V1.20, by Attachmate Corp.","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id RAA04054 for <jwz@urchin.netscape.com>; Thu, 8 Feb 1996 17:35:41 -0800","Content-Length":"46628"},"date":"978307200","messageID":"19960209013311.izzy@scr.atm.com","receivedDate":"978307200","subject":"Example of CID linking in a multipart\/related MIME message","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"ISO-8859-1","class":"mailcore::Attachment"},{"contentID":"2.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"1","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"attach3.gif"},{"contentID":"3.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"2","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"liluse.gif"},{"contentID":"5.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"3","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"wollogo2.gif"},{"contentID":"0.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"4","mimeType":"image\/gif","inlineAttachment":"1","contentDescription":"The Sender's Signature","class":"mailcore::Attachment","filename":"BULLDOG.GIF"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jwz@netscape.com"}]},"from":{"class":"mailcore::Address","mailbox":"izzy@scr.atm.com"},"extraHeaders":{"Return-Path":"izzy@scr.atm.com","Content-Type":"multipart\/related;\u000a   boundary=\"=_09tW13g.bO1996u.N01d000A.r02Y.33:0018d7\";\u000a   type=\"text\/html\";\u000a   start-info=\"X-twg-cidlinking-V1.2\"","MIME-Version":"1.0","Status":"U","X-Mozilla-Status":"0001","X-UIDL":"823829838.001","Content-Transfer-Encoding":"7bit","X-Mailer":"Emissary V1.20, by Attachmate Corp.","Received":"from maleman.mcom.com (maleman.mcom.com [198.93.92.3]) by urchin.netscape.com (8.6.12\/8.6.9) with ESMTP id RAA04054 for <jwz@urchin.netscape.com>; Thu, 8 Feb 1996 17:35:41 -0800","Content-Length":"46628"},"date":"823829590","messageID":"19960209013311.izzy@scr.atm.com","receivedDate":"823829590","subject":"Example of CID linking in a multipart\/related MIME message","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/related","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/html","charset":"ISO-8859-1","class":"mailcore::Attachment"},{"contentID":"2.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"1","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"attach3.gif"},{"contentID":"3.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"2","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"liluse.gif"},{"contentID":"5.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"3","mimeType":"image\/gif","inlineAttachment":"1","class":"mailcore::Attachment","filename":"wollogo2.gif"},{"contentID":"0.19960209013310.izzy@scr.atm.com","partType":"single","uniqueID":"4","mimeType":"image\/gif","inlineAttachment":"1","contentDescription":"The Sender's Signature","class":"mailcore::Attachment","filename":"BULLDOG.GIF"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/85 b/unittest/data/parser/output/mbox/jwz/85
index 2a54edd7..4bbc98e0 100644
--- a/unittest/data/parser/output/mbox/jwz/85
+++ b/unittest/data/parser/output/mbox/jwz/85
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Harold A. Miller","mailbox":"Hal.Miller@mel.dit.csiro.au"},"extraHeaders":{"Return-Path":"<hal@mel.dit.csiro.au>","Content-Type":"audio\/basic","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA06662> for nsb; Wed, 11 Mar 92 18:41:16 EST","Cc":""},"date":"978307200","messageID":"199203112327.AA03185@shark.mel.dit.csiro.au","receivedDate":"978307200","subject":"Re: Barbershop MIME","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"audio\/basic","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"nsb@thumper.bellcore.com"}]},"from":{"class":"mailcore::Address","displayName":"Harold A. Miller","mailbox":"Hal.Miller@mel.dit.csiro.au"},"extraHeaders":{"Return-Path":"<hal@mel.dit.csiro.au>","Content-Type":"audio\/basic","MIME-Version":"1.0","Content-Transfer-Encoding":"base64","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA06662> for nsb; Wed, 11 Mar 92 18:41:16 EST","Cc":""},"date":"700356458","messageID":"199203112327.AA03185@shark.mel.dit.csiro.au","receivedDate":"700356458","subject":"Re: Barbershop MIME","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"audio\/basic","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/87 b/unittest/data/parser/output/mbox/jwz/87
index 9d612a11..2ef25a3a 100644
--- a/unittest/data/parser/output/mbox/jwz/87
+++ b/unittest/data/parser/output/mbox/jwz/87
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"markm@voicenet.com"},"extraHeaders":{"Content-Type":"multipart\/signed; boundary=\"axb+h+IbI\/zv+u\";\u000a   protocol=\"application\/pgp-signature\"; micalg=pgp-md5","Lines":"51","Approved":"usenet@netscape.com","NNTP-Posting-Host":"tera.mcom.com","Newsgroups":"mcom.list.cypherpunks","Mime-Version":"1.0","Path":"tera.mcom.com!news-mail-gateway","Organization":"Local Mail\/News Gateway"},"date":"978307200","sender":{"class":"mailcore::Address","mailbox":"daemon@tera.mcom.com"},"messageID":"Pine.LNX.3.93.960527203358.1163A-100000@gak","receivedDate":"978307200","subject":"Re: Layman's explanation for limits on escrowed encryption ...","class":"mailcore::MessageHeader","references":["01I53K6SDN348Y4Z90@mbcl.rutgers.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/pgp-signature","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"markm@voicenet.com"},"extraHeaders":{"Content-Type":"multipart\/signed; boundary=\"axb+h+IbI\/zv+u\";\u000a   protocol=\"application\/pgp-signature\"; micalg=pgp-md5","Lines":"51","Approved":"usenet@netscape.com","NNTP-Posting-Host":"tera.mcom.com","Newsgroups":"mcom.list.cypherpunks","Mime-Version":"1.0","Path":"tera.mcom.com!news-mail-gateway","Organization":"Local Mail\/News Gateway"},"date":"833246391","sender":{"class":"mailcore::Address","mailbox":"daemon@tera.mcom.com"},"messageID":"Pine.LNX.3.93.960527203358.1163A-100000@gak","receivedDate":"833246391","subject":"Re: Layman's explanation for limits on escrowed encryption ...","class":"mailcore::MessageHeader","references":["01I53K6SDN348Y4Z90@mbcl.rutgers.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/signed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"1","mimeType":"application\/pgp-signature","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/88 b/unittest/data/parser/output/mbox/jwz/88
index 55e8ddad..518aca8c 100644
--- a/unittest/data/parser/output/mbox/jwz/88
+++ b/unittest/data/parser/output/mbox/jwz/88
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"IN%\"OS2-L@HEARN.nic.SURFnet.nl\"\"MultiplerecipientsoflistOS2-L\""},{"class":"mailcore::Address","displayName":"Multiple recipients of list OS2-L","mailbox":"OS2-L@HEARN.nic.SURFnet.nl"}]},"from":{"class":"mailcore::Address","displayName":"Jeffrey A. Stuart","mailbox":"ncoast!tdi3!tdi4!jstuart@USENET.INS.CWRU.EDU"},"extraHeaders":{"Lines":"40","MIME-version":"1.0","Content-transfer-encoding":"7bit","CC":"","Newsgroups":"bit.listserv.os2-l","X-Mailer":"exmh version 1.6delta 4\/7\/95","Return-path":"<owner-os2-l@HEARN.NIC.SURFNET.NL>","Path":"flop.mcom.com!news.Stanford.EDU!lll-winken.llnl.gov!elroy.jpl.nasa.gov!netline-fddi.jpl.nasa.gov!nntp-server.caltech.edu!vixen.cso.uiuc.edu!howland.reston.ans.net!news.sprintlink.net!vaxa.hofstra.edu!hofnews","Content-type":"application\/pgp; format=mime; x-action=signclear;x-originator=22CDDBF5"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"IBM OS\/2 Unedited Discussion List","mailbox":"OS2-L@HEARN.nic.SURFnet.nl"},"messageID":"199504252230.SAA26982@tdi3.tridelta.com","receivedDate":"978307200","subject":"Re: New Virus Alert! No","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"IBM OS\/2 Unedited Discussion List","mailbox":"OS2-L@HEARN.nic.SURFnet.nl"}]},"inReplyTo":["batec08@NERVM.NERDC.UFL.EDU","199504251232.IAA20833@name.ufl.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/pgp","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"IN%\"OS2-L@HEARN.nic.SURFnet.nl\"\"MultiplerecipientsoflistOS2-L\""},{"class":"mailcore::Address","displayName":"Multiple recipients of list OS2-L","mailbox":"OS2-L@HEARN.nic.SURFnet.nl"}]},"from":{"class":"mailcore::Address","displayName":"Jeffrey A. Stuart","mailbox":"ncoast!tdi3!tdi4!jstuart@USENET.INS.CWRU.EDU"},"extraHeaders":{"Lines":"40","MIME-version":"1.0","Content-transfer-encoding":"7bit","CC":"","Newsgroups":"bit.listserv.os2-l","X-Mailer":"exmh version 1.6delta 4\/7\/95","Return-path":"<owner-os2-l@HEARN.NIC.SURFNET.NL>","Path":"flop.mcom.com!news.Stanford.EDU!lll-winken.llnl.gov!elroy.jpl.nasa.gov!netline-fddi.jpl.nasa.gov!nntp-server.caltech.edu!vixen.cso.uiuc.edu!howland.reston.ans.net!news.sprintlink.net!vaxa.hofstra.edu!hofnews","Content-type":"application\/pgp; format=mime; x-action=signclear;x-originator=22CDDBF5"},"date":"798848891","sender":{"class":"mailcore::Address","displayName":"IBM OS\/2 Unedited Discussion List","mailbox":"OS2-L@HEARN.nic.SURFnet.nl"},"messageID":"199504252230.SAA26982@tdi3.tridelta.com","receivedDate":"798848891","subject":"Re: New Virus Alert! No","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"IBM OS\/2 Unedited Discussion List","mailbox":"OS2-L@HEARN.nic.SURFnet.nl"}]},"inReplyTo":["batec08@NERVM.NERDC.UFL.EDU","199504251232.IAA20833@name.ufl.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/pgp","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/89 b/unittest/data/parser/output/mbox/jwz/89
index 6ed32935..4f239cd4 100644
--- a/unittest/data/parser/output/mbox/jwz/89
+++ b/unittest/data/parser/output/mbox/jwz/89
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"crobinso@clam.rutgers.edu"}]},"from":{"class":"mailcore::Address","displayName":"zxc","mailbox":"zxc@uiuc.edu"},"extraHeaders":{"X-URL":"news:3nm097$gbj@clam.rutgers.edu","Content-Type":"text\/plain; charset=us-ascii","Lines":"28","NNTP-Posting-Host":"nuntana.animal.uiuc.edu","Newsgroups":"comp.os.linux.misc","X-Mailer":"Mozilla 1.1N (X11; I; Linux 1.2.3 i486)","Content-Transfer-Encoding":"7bit","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!spool.mu.edu!howland.reston.ans.net!vixen.cso.uiuc.edu!usenet","Organization":"University of Illinois at Urbana"},"date":"978307200","messageID":"3nm2gc$m6l@vixen.cso.uiuc.edu","receivedDate":"978307200","subject":"Re: Netscape1.1","class":"mailcore::MessageHeader","references":["3nm097$gbj@clam.rutgers.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"crobinso@clam.rutgers.edu"}]},"from":{"class":"mailcore::Address","displayName":"zxc","mailbox":"zxc@uiuc.edu"},"extraHeaders":{"X-URL":"news:3nm097$gbj@clam.rutgers.edu","Content-Type":"text\/plain; charset=us-ascii","Lines":"28","NNTP-Posting-Host":"nuntana.animal.uiuc.edu","Newsgroups":"comp.os.linux.misc","X-Mailer":"Mozilla 1.1N (X11; I; Linux 1.2.3 i486)","Content-Transfer-Encoding":"7bit","Mime-Version":"1.0","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!spool.mu.edu!howland.reston.ans.net!vixen.cso.uiuc.edu!usenet","Organization":"University of Illinois at Urbana"},"date":"798920012","messageID":"3nm2gc$m6l@vixen.cso.uiuc.edu","receivedDate":"798920012","subject":"Re: Netscape1.1","class":"mailcore::MessageHeader","references":["3nm097$gbj@clam.rutgers.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"us-ascii","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/90 b/unittest/data/parser/output/mbox/jwz/90
index fcff71dd..a3d82ccd 100644
--- a/unittest/data/parser/output/mbox/jwz/90
+++ b/unittest/data/parser/output/mbox/jwz/90
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"John Lamb","mailbox":"lamb"},{"class":"mailcore::Address","displayName":"Michael Littman","mailbox":"mlittman"},{"class":"mailcore::Address","displayName":"David A. Braun","mailbox":"braun"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"},{"class":"mailcore::Address","mailbox":"info-metamail"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Return-Path":"<nsb>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.Qdjbh920M2Yt4L5uUD\"","Received":"by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA06406> for nsb; Wed, 11 Mar 92 16:27:44 EST","Mime-Version":"1.0","X-Andrew-Message-Size":"555+2"},"date":"978307200","messageID":"Edjbh9O0M2YtQL5uct@thumper.bellcore.com","receivedDate":"978307200","subject":"Barbershop MIME","class":"mailcore::MessageHeader","references":["QdjbYVC0M2Yt4L5stL@thumper.bellcore.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"message\/external-body","contentDescription":"Let Me Sing You Email (audio)","class":"mailcore::Attachment","filename":"quartet.au"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"message\/external-body","contentDescription":"The Telephone Chords, A Moment Immortalized","class":"mailcore::Attachment","filename":"quartet.gif"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"John Lamb","mailbox":"lamb"},{"class":"mailcore::Address","displayName":"Michael Littman","mailbox":"mlittman"},{"class":"mailcore::Address","displayName":"David A. Braun","mailbox":"braun"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"ietf-822@dimacs.rutgers.edu"},{"class":"mailcore::Address","mailbox":"info-metamail"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Return-Path":"<nsb>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.Qdjbh920M2Yt4L5uUD\"","Received":"by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA06406> for nsb; Wed, 11 Mar 92 16:27:44 EST","Mime-Version":"1.0","X-Andrew-Message-Size":"555+2"},"date":"700349257","messageID":"Edjbh9O0M2YtQL5uct@thumper.bellcore.com","receivedDate":"700349257","subject":"Barbershop MIME","class":"mailcore::MessageHeader","references":["QdjbYVC0M2Yt4L5stL@thumper.bellcore.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"message\/external-body","contentDescription":"Let Me Sing You Email (audio)","class":"mailcore::Attachment","filename":"quartet.au"},{"partType":"single","uniqueID":"3","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"message\/external-body","contentDescription":"The Telephone Chords, A Moment Immortalized","class":"mailcore::Attachment","filename":"quartet.gif"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/93 b/unittest/data/parser/output/mbox/jwz/93
index 9c1f7b21..881520ef 100644
--- a/unittest/data/parser/output/mbox/jwz/93
+++ b/unittest/data/parser/output/mbox/jwz/93
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"dave@expo.lcs.mit.edu"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Fred Hansen","mailbox":"wjh+@andrew.cmu.edu"}]},"from":{"class":"mailcore::Address","displayName":"Michael J. McInerny","mailbox":"mcinerny+@andrew.cmu.edu"},"extraHeaders":{"Return-Path":"<wjh+@andrew.cmu.edu>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.8eBYTr200hYx4uHkoz\"","Resent-Message-Id":"<ceBYuie00Vs4ANk04J@andrew.cmu.edu>","Resent-From":"Fred Hansen <wjh+@andrew.cmu.edu>","Resent-Date":"Wed, 10 Jun 1992 14:49:18 -0400 (EDT)","Resent-To":"gk5g+@andrew.cmu.edu, nsb+@andrew.cmu.edu","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA01494> for nsb; Wed, 10 Jun 92 14:51:18 EDT","Mime-Version":"1.0","X-Andrew-Message-Size":"762+8"},"date":"978307200","messageID":"MeBYTrq00hYx4uHkwL@andrew.cmu.edu","receivedDate":"978307200","subject":"Re: icons","class":"mailcore::MessageHeader","inReplyTo":["0eBXzMC00Vs4QNk9oL@andrew.cmu.edu"],"references":["9206101740.AA07174@kanga.lcs.mit.edu","0eBXzMC00Vs4QNk9oL@andrew.cmu.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"13","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"14","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"15","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"16","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"17","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"dave@expo.lcs.mit.edu"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Fred Hansen","mailbox":"wjh+@andrew.cmu.edu"}]},"from":{"class":"mailcore::Address","displayName":"Michael J. McInerny","mailbox":"mcinerny+@andrew.cmu.edu"},"extraHeaders":{"Return-Path":"<wjh+@andrew.cmu.edu>","Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.8eBYTr200hYx4uHkoz\"","Resent-Message-Id":"<ceBYuie00Vs4ANk04J@andrew.cmu.edu>","Resent-From":"Fred Hansen <wjh+@andrew.cmu.edu>","Resent-Date":"Wed, 10 Jun 1992 14:49:18 -0400 (EDT)","Resent-To":"gk5g+@andrew.cmu.edu, nsb+@andrew.cmu.edu","Received":"from thumper.bellcore.com by greenbush.bellcore.com (4.1\/4.7)\u000a\u0009id <AA01494> for nsb; Wed, 10 Jun 92 14:51:18 EDT","Mime-Version":"1.0","X-Andrew-Message-Size":"762+8"},"date":"708200439","messageID":"MeBYTrq00hYx4uHkwL@andrew.cmu.edu","receivedDate":"708200439","subject":"Re: icons","class":"mailcore::MessageHeader","inReplyTo":["0eBXzMC00Vs4QNk9oL@andrew.cmu.edu"],"references":["9206101740.AA07174@kanga.lcs.mit.edu","0eBXzMC00Vs4QNk9oL@andrew.cmu.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"6","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"7","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"8","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"9","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"10","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"11","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"12","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"13","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"14","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"15","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"16","mimeType":"image\/x-xwd","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"17","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/94 b/unittest/data/parser/output/mbox/jwz/94
index 420d6348..53acb6d4 100644
--- a/unittest/data/parser/output/mbox/jwz/94
+++ b/unittest/data/parser/output/mbox/jwz/94
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jbw@bigbird.bu.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.geteZma0M2Yt93sYwo\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Thu, 22 Oct 1992 09:15:31 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"546+1"},"date":"978307200","messageID":"keteZn20M2YtJ3sZ5q@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: Could you translate (\u05dd\u05d5\u05dc\u05e9 \u05df\u05d1 \u05d9\u05dc\u05d8\u05e4\u05e0) for me?","class":"mailcore::MessageHeader","inReplyTo":["9210220105.AA19399@bigbird.bu.edu"],"references":["9210220105.AA19399@bigbird.bu.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"My screen reading your mail","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"jbw@bigbird.bu.edu"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.geteZma0M2Yt93sYwo\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Thu, 22 Oct 1992 09:15:31 -0400 (EDT)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"546+1"},"date":"719759731","messageID":"keteZn20M2YtJ3sZ5q@thumper.bellcore.com","receivedDate":"719759731","subject":"Re: Could you translate (\u05dd\u05d5\u05dc\u05e9 \u05df\u05d1 \u05d9\u05dc\u05d8\u05e4\u05e0) for me?","class":"mailcore::MessageHeader","inReplyTo":["9210220105.AA19399@bigbird.bu.edu"],"references":["9210220105.AA19399@bigbird.bu.edu"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","contentDescription":"My screen reading your mail","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/96 b/unittest/data/parser/output/mbox/jwz/96
index e1cd08f6..fd13526a 100644
--- a/unittest/data/parser/output/mbox/jwz/96
+++ b/unittest/data/parser/output/mbox/jwz/96
@@ -1 +1 @@
-{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jonathan Rosenberg","mailbox":"jxr"},{"class":"mailcore::Address","displayName":"Robert E Kraut","mailbox":"kraut"},{"class":"mailcore::Address","displayName":"Al Buzzard","mailbox":"alb"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Terry Crowley","mailbox":"tcrowley@diamond.bbn.com"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.8fQc7B:0M2Yt47NCon\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Fri,  5 Feb 1993 10:03:45 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"1184+2"},"date":"978307200","messageID":"AfQc7Fu0M2YtM7NCws@thumper.bellcore.com","receivedDate":"978307200","subject":"Re: Audio","class":"mailcore::MessageHeader","inReplyTo":["9302051445.AA10767@dilithium.bbn.com"],"references":["9302051445.AA10767@dilithium.bbn.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"audio\/basic","contentDescription":"I'm VERY happy!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/gif","contentDescription":"My daughter Miriam","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
-\ No newline at end of file
+{"header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Jonathan Rosenberg","mailbox":"jxr"},{"class":"mailcore::Address","displayName":"Robert E Kraut","mailbox":"kraut"},{"class":"mailcore::Address","displayName":"Al Buzzard","mailbox":"alb"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","displayName":"Terry Crowley","mailbox":"tcrowley@diamond.bbn.com"}]},"from":{"class":"mailcore::Address","displayName":"Nathaniel Borenstein","mailbox":"nsb"},"extraHeaders":{"Content-Type":"multipart\/alternative; \u000a\u0009boundary=\"Interpart.Boundary.8fQc7B:0M2Yt47NCon\"","MIME-Version":"1.0","Received":"from Messages.8.5.N.CUILIB.3.45.SNAP.NOT.LINKED.greenbush.galaxy.sun4.41\u000a          via MS.5.6.greenbush.galaxy.sun4_41;\u000a          Fri,  5 Feb 1993 10:03:45 -0500 (EST)","X-Andrew-Authenticated-As":"4099;greenbush.galaxy;Nathaniel Borenstein","X-Andrew-Message-Size":"1184+2"},"date":"728924625","messageID":"AfQc7Fu0M2YtM7NCws@thumper.bellcore.com","receivedDate":"728924625","subject":"Re: Audio","class":"mailcore::MessageHeader","inReplyTo":["9302051445.AA10767@dilithium.bbn.com"],"references":["9302051445.AA10767@dilithium.bbn.com"]},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"1","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"2","mimeType":"audio\/basic","contentDescription":"I'm VERY happy!","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"3","mimeType":"text\/richtext","charset":"US-ASCII","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"4","mimeType":"image\/gif","contentDescription":"My daughter Miriam","class":"mailcore::Attachment"},{"partType":"single","uniqueID":"5","mimeType":"text\/plain","charset":"US-ASCII","class":"mailcore::Attachment"}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/98 b/unittest/data/parser/output/mbox/jwz/98
index df8404b5..bf25c97c 100644
--- a/unittest/data/parser/output/mbox/jwz/98
+++ b/unittest/data/parser/output/mbox/jwz/98
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","displayName":"Stefano Gazziano","mailbox":"GAZZIANO_S@CASACCIA.ENEA.IT"},"extraHeaders":{"Lines":"37","MIME-version":"1.0","Newsgroups":"comp.soft-sys.sas","Comments":"Gated by NETNEWS@AUVM.AMERICAN.EDU","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!news.kei.com!hookup!lll-winken.llnl.gov!uwm.edu!cs.utexas.edu!swrinde!gatech!paladin.american.edu!auvm!CASACCIA.ENEA.IT!GAZZIANO_S","Content-type":"MESSAGE\/RFC822"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"SAS(r) Discussion","mailbox":"SAS-L%VTVM1.BITNET@VTBIT.CC.VT.EDU"},"messageID":"01HPSYRPA1IAERWENE@ECA401.CASACCIA.ENEA.IT","receivedDate":"978307200","subject":"work space","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"GAZZIANO_S@CASACCIA.ENEA.IT"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"gazziano_s@casaccia.enea.it"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"sas-l@uga.ucc.uga.edu"}]},"from":{"class":"mailcore::Address","mailbox":"GAZZIANO_S@casaccia.enea.it"},"extraHeaders":{"Received":"from ECA401.CASACCIA.ENEA.IT by ECA401.CASACCIA.ENEA.IT\u000a (PMDF V4.3-7 #3856) id <01HPSWPQHFQ8ERWELB@ECA401.CASACCIA.ENEA.IT>; Wed,\u000a 26 Apr 1995 17:31:53 +1","Return-path":"<GAZZIANO_S@casaccia.enea.it>"},"date":"978307200","messageID":"01HPSWRQOS4IERWELB@ECA401.CASACCIA.ENEA.IT","receivedDate":"978307200","subject":"work file space","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","displayName":"Stefano Gazziano","mailbox":"GAZZIANO_S@CASACCIA.ENEA.IT"},"extraHeaders":{"Lines":"37","MIME-version":"1.0","Newsgroups":"comp.soft-sys.sas","Comments":"Gated by NETNEWS@AUVM.AMERICAN.EDU","Path":"flop.mcom.com!news.Stanford.EDU!bloom-beacon.mit.edu!news.kei.com!hookup!lll-winken.llnl.gov!uwm.edu!cs.utexas.edu!swrinde!gatech!paladin.american.edu!auvm!CASACCIA.ENEA.IT!GAZZIANO_S","Content-type":"MESSAGE\/RFC822"},"date":"798920507","sender":{"class":"mailcore::Address","displayName":"SAS(r) Discussion","mailbox":"SAS-L%VTVM1.BITNET@VTBIT.CC.VT.EDU"},"messageID":"01HPSYRPA1IAERWENE@ECA401.CASACCIA.ENEA.IT","receivedDate":"798920507","subject":"work space","class":"mailcore::MessageHeader","replyTo":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"GAZZIANO_S@CASACCIA.ENEA.IT"}]}},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"cc":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"gazziano_s@casaccia.enea.it"}]},"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"sas-l@uga.ucc.uga.edu"}]},"from":{"class":"mailcore::Address","mailbox":"GAZZIANO_S@casaccia.enea.it"},"extraHeaders":{"Received":"from ECA401.CASACCIA.ENEA.IT by ECA401.CASACCIA.ENEA.IT\u000a (PMDF V4.3-7 #3856) id <01HPSWPQHFQ8ERWELB@ECA401.CASACCIA.ENEA.IT>; Wed,\u000a 26 Apr 1995 17:31:53 +1","Return-path":"<GAZZIANO_S@casaccia.enea.it>"},"date":"798917078","messageID":"01HPSWRQOS4IERWELB@ECA401.CASACCIA.ENEA.IT","receivedDate":"798917078","subject":"work file space","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/PLAIN","charset":"US-ASCII","class":"mailcore::Attachment"}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/simple/1 b/unittest/data/parser/output/mbox/simple/1
index 6856c0bf..655db3c1 100644
--- a/unittest/data/parser/output/mbox/simple/1
+++ b/unittest/data/parser/output/mbox/simple/1
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"fejj@gnome.org"}]},"from":{"class":"mailcore::Address","mailbox":"fejj@gnome.org"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"x\"","MIME-Version":"1.0","X-Test-Header":""},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"this'll probably break a lot of mime parsers","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"fejj@gnome.org"}]},"from":{"class":"mailcore::Address","mailbox":"fejj@gnome.org"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"x\"","MIME-Version":"1.0","X-Test-Header":""},"date":"1030084373","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"1030084373","subject":"this'll probably break a lot of mime parsers","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}]}}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/simple/2 b/unittest/data/parser/output/mbox/simple/2
index 4ee5b83f..e7a942db 100644
--- a/unittest/data/parser/output/mbox/simple/2
+++ b/unittest/data/parser/output/mbox/simple/2
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"fejj@gnome.org"}]},"from":{"class":"mailcore::Address","mailbox":"fejj@gnome.org"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"x\"","MIME-Version":"1.0"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"this'll probably break even more mime parsers","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"fejj@gnome.org"}]},"from":{"class":"mailcore::Address","mailbox":"fejj@gnome.org"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"x\"","MIME-Version":"1.0"},"date":"1030084373","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"1030084373","subject":"this'll probably break even more mime parsers","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/simple/3 b/unittest/data/parser/output/mbox/simple/3
index 45c35307..ac2a9cb5 100644
--- a/unittest/data/parser/output/mbox/simple/3
+++ b/unittest/data/parser/output/mbox/simple/3
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"fejj@gnome.org"}]},"from":{"class":"mailcore::Address","mailbox":"fejj@gnome.org"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"\"","MIME-Version":"1.0"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"if a mime parser can correctly handle this, I'm impressed","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"fejj@gnome.org"}]},"from":{"class":"mailcore::Address","mailbox":"fejj@gnome.org"},"extraHeaders":{"Content-Type":"multipart\/mixed; boundary=\"\"","MIME-Version":"1.0"},"date":"1030084373","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"1030084373","subject":"if a mime parser can correctly handle this, I'm impressed","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/messages/empty-multipart.txt b/unittest/data/parser/output/messages/empty-multipart.txt
index a0453a44..40c64e88 100644
--- a/unittest/data/parser/output/messages/empty-multipart.txt
+++ b/unittest/data/parser/output/messages/empty-multipart.txt
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mimekit@example.com"}]},"from":{"class":"mailcore::Address","mailbox":"mimekit@example.com"},"extraHeaders":{"Content-Type":"multipart\/mixed;\u000a\u0009boundary=\"----=_NextPart_000_003F_01CE98CE.6E826F90\"","MIME-Version":"1.0","X-Mailer":"Microsoft Office Outlook 12.0"},"date":"978307200","messageID":"54AD68C9E3B0184CAC6041320424FD1B5B81E74D@localhost.localdomain","receivedDate":"978307200","subject":"test of empty multipart\/alternative","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mimekit@example.com"}]},"from":{"class":"mailcore::Address","mailbox":"mimekit@example.com"},"extraHeaders":{"Content-Type":"multipart\/mixed;\u000a\u0009boundary=\"----=_NextPart_000_003F_01CE98CE.6E826F90\"","MIME-Version":"1.0","X-Mailer":"Microsoft Office Outlook 12.0"},"date":"1384265562","messageID":"54AD68C9E3B0184CAC6041320424FD1B5B81E74D@localhost.localdomain","receivedDate":"1384265562","subject":"test of empty multipart\/alternative","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"multipart\/alternative","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[]}},{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}]}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/messages/headers.txt b/unittest/data/parser/output/messages/headers.txt
index 22594d31..beeeeb76 100644
--- a/unittest/data/parser/output/messages/headers.txt
+++ b/unittest/data/parser/output/messages/headers.txt
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mimekit@example.com"}]},"from":{"class":"mailcore::Address","displayName":"\u0412\u0435\u0441\u0442\u043d\u0438\u043a \u0427\u0438\u043f\u0442\u0440\u0438\u043f\u0430\u00ae :)","mailbox":"cheaptripinsider@moitrip.ru"},"extraHeaders":{"Content-Type":"plain\/text","MIME-Version":"1.0","X-Mailer":"Microsoft Office Outlook 12.0"},"date":"978307200","sender":{"class":"mailcore::Address","displayName":"\u0412\u0435\u0441\u0442\u043d\u0438\u043a \u0427\u0438\u043f\u0442\u0440\u0438\u043f\u0430\u00ae :)","mailbox":"cheaptripinsider@mail139-244.wdc04.mandrillapp.com"},"messageID":"54AD68C9E3B0184CAC6041320424FD1B5B81E74D@localhost.localdomain","receivedDate":"978307200","subject":"test of empty multipart\/alternative","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"plain\/text","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","mailbox":"mimekit@example.com"}]},"from":{"class":"mailcore::Address","displayName":"\u0412\u0435\u0441\u0442\u043d\u0438\u043a \u0427\u0438\u043f\u0442\u0440\u0438\u043f\u0430\u00ae :)","mailbox":"cheaptripinsider@moitrip.ru"},"extraHeaders":{"Content-Type":"plain\/text","MIME-Version":"1.0","X-Mailer":"Microsoft Office Outlook 12.0"},"date":"1384265562","sender":{"class":"mailcore::Address","displayName":"\u0412\u0435\u0441\u0442\u043d\u0438\u043a \u0427\u0438\u043f\u0442\u0440\u0438\u043f\u0430\u00ae :)","mailbox":"cheaptripinsider@mail139-244.wdc04.mandrillapp.com"},"messageID":"54AD68C9E3B0184CAC6041320424FD1B5B81E74D@localhost.localdomain","receivedDate":"1384265562","subject":"test of empty multipart\/alternative","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"plain\/text","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/messages/multipart-digest.txt b/unittest/data/parser/output/messages/multipart-digest.txt
index e4aa758b..406ae72d 100644
--- a/unittest/data/parser/output/messages/multipart-digest.txt
+++ b/unittest/data/parser/output/messages/multipart-digest.txt
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"user@domain.org"},"extraHeaders":{"Content-Type":"message\/rfc822","Mime-Version":"1.0"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"sub@domain.org"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"submsg","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"m1@example.com"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"m1","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"m2@example.com"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"m2","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"user@domain.org"},"extraHeaders":{"Content-Type":"message\/rfc822","Mime-Version":"1.0"},"date":"1174770000","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"1174770000","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"sub@domain.org"},"date":"1344764096","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"1344764096","subject":"submsg","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"multipart\/mixed","class":"mailcore::Multipart","parts":{"class":"mailcore::Array","items":[{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"m1@example.com"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"m1","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"0","mimeType":"text\/plain","class":"mailcore::Attachment"}},{"partType":"message","header":{"from":{"class":"mailcore::Address","mailbox":"m2@example.com"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"m2","class":"mailcore::MessageHeader"},"class":"mailcore::MessagePart","mainPart":{"partType":"single","uniqueID":"1","mimeType":"text\/plain","class":"mailcore::Attachment"}}]}}}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/partial/message-partial.1.msg.txt b/unittest/data/parser/output/partial/message-partial.1.msg.txt
index 2b23edae..34c6bd16 100644
--- a/unittest/data/parser/output/partial/message-partial.1.msg.txt
+++ b/unittest/data/parser/output/partial/message-partial.1.msg.txt
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"anonymous@anon.lcs.mit.edu"},"extraHeaders":{"Content-Type":"message\/partial; id=\"<skippy.Soft.1020332481@id.com>\"; number=1; total=2","Xref":"usenetserver.com alt.binaries.pictures.suze:408595","Lines":"2042","MIME-Version":"1.0","Mail-To-News-Contact":"postmaster@nym.alias.net","Newsgroups":"alt.binaries.pictures.suze","X-Received-Date":"Thu, 02 May 2002 06:28:50 EDT (atlpnn01.usenetserver.com)","Path":"atlpnn01.usenetserver.com!newsfeeds-atl2!peer1-sjc1.usenetserver.com!usenetserver.com!hub1.nntpserver.com!newsfeed4.cidera.com!newsfeed1.cidera.com!Cidera!cyclone1.gnilink.net!news-out.nuthinbutnews.com!propagator-sterling!news-in.nuthinbutnews.com!micro-heart-of-gold.mit.edu!nntp.club.cc.cmu.edu!bb3.andrew.cmu.edu!newsfeed.srv.cs.cmu.edu!anon.lcs.mit.edu!nym.alias.net!mail2news","Organization":"mail2news@nym.alias.net"},"date":"978307200","messageID":"skippy.Soft.1020332481_1@id.com","receivedDate":"978307200","subject":"{15_3779; Victoria & Cherry}: suzeFan - 2377h003.jpg (1\/2)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"anonymous@anon.lcs.mit.edu"},"extraHeaders":{"Content-Type":"message\/partial; id=\"<skippy.Soft.1020332481@id.com>\"; number=1; total=2","Xref":"usenetserver.com alt.binaries.pictures.suze:408595","Lines":"2042","MIME-Version":"1.0","Mail-To-News-Contact":"postmaster@nym.alias.net","Newsgroups":"alt.binaries.pictures.suze","X-Received-Date":"Thu, 02 May 2002 06:28:50 EDT (atlpnn01.usenetserver.com)","Path":"atlpnn01.usenetserver.com!newsfeeds-atl2!peer1-sjc1.usenetserver.com!usenetserver.com!hub1.nntpserver.com!newsfeed4.cidera.com!newsfeed1.cidera.com!Cidera!cyclone1.gnilink.net!news-out.nuthinbutnews.com!propagator-sterling!news-in.nuthinbutnews.com!micro-heart-of-gold.mit.edu!nntp.club.cc.cmu.edu!bb3.andrew.cmu.edu!newsfeed.srv.cs.cmu.edu!anon.lcs.mit.edu!nym.alias.net!mail2news","Organization":"mail2news@nym.alias.net"},"date":"1020332553","messageID":"skippy.Soft.1020332481_1@id.com","receivedDate":"1020332553","subject":"{15_3779; Victoria & Cherry}: suzeFan - 2377h003.jpg (1\/2)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/parser/output/partial/message-partial.2.msg.txt b/unittest/data/parser/output/partial/message-partial.2.msg.txt
index e0822f1d..5575caf3 100644
--- a/unittest/data/parser/output/partial/message-partial.2.msg.txt
+++ b/unittest/data/parser/output/partial/message-partial.2.msg.txt
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"anonymous@anon.lcs.mit.edu"},"extraHeaders":{"Content-Type":"message\/partial; id=\"<skippy.Soft.1020332481@id.com>\"; number=2; total=2","Xref":"usenetserver.com alt.binaries.pictures.suze:408592","Lines":"49","MIME-Version":"1.0","Mail-To-News-Contact":"postmaster@nym.alias.net","Newsgroups":"alt.binaries.pictures.suze","X-Received-Date":"Thu, 02 May 2002 06:28:33 EDT (atlpnn01.usenetserver.com)","Path":"atlpnn01.usenetserver.com!newsfeeds-atl2!peer1-sjc1.usenetserver.com!usenetserver.com!hub1.nntpserver.com!xmission!isdnet!micro-heart-of-gold.mit.edu!nntp.club.cc.cmu.edu!bb3.andrew.cmu.edu!newsfeed.srv.cs.cmu.edu!anon.lcs.mit.edu!nym.alias.net!mail2news","Organization":"mail2news@nym.alias.net"},"date":"978307200","messageID":"skippy.Soft.1020332481_2@id.com","receivedDate":"978307200","subject":"{15_3779; Victoria & Cherry}: suzeFan - 2377h003.jpg (2\/2)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
-\ No newline at end of file
+{"header":{"from":{"class":"mailcore::Address","mailbox":"anonymous@anon.lcs.mit.edu"},"extraHeaders":{"Content-Type":"message\/partial; id=\"<skippy.Soft.1020332481@id.com>\"; number=2; total=2","Xref":"usenetserver.com alt.binaries.pictures.suze:408592","Lines":"49","MIME-Version":"1.0","Mail-To-News-Contact":"postmaster@nym.alias.net","Newsgroups":"alt.binaries.pictures.suze","X-Received-Date":"Thu, 02 May 2002 06:28:33 EDT (atlpnn01.usenetserver.com)","Path":"atlpnn01.usenetserver.com!newsfeeds-atl2!peer1-sjc1.usenetserver.com!usenetserver.com!hub1.nntpserver.com!xmission!isdnet!micro-heart-of-gold.mit.edu!nntp.club.cc.cmu.edu!bb3.andrew.cmu.edu!newsfeed.srv.cs.cmu.edu!anon.lcs.mit.edu!nym.alias.net!mail2news","Organization":"mail2news@nym.alias.net"},"date":"1020332554","messageID":"skippy.Soft.1020332481_2@id.com","receivedDate":"1020332554","subject":"{15_3779; Victoria & Cherry}: suzeFan - 2377h003.jpg (2\/2)","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"message\/partial","class":"mailcore::Attachment"}}
+\ No newline at end of file
diff --git a/unittest/data/summary/input/2765-korean-failed.eml b/unittest/data/summary/input/2765-korean.eml
index b1114068..b1114068 100644
--- a/unittest/data/summary/input/2765-korean-failed.eml
+++ b/unittest/data/summary/input/2765-korean.eml
diff --git a/unittest/data/summary/input/3424-encoding-failed.eml b/unittest/data/summary/input/3424-encoding.eml
index 52c570f8..52c570f8 100644
--- a/unittest/data/summary/input/3424-encoding-failed.eml
+++ b/unittest/data/summary/input/3424-encoding.eml
diff --git a/unittest/data/summary/input/6094-japanese-1-failed.eml b/unittest/data/summary/input/6094-japanese-1.eml
index 4a50f366..4a50f366 100644
--- a/unittest/data/summary/input/6094-japanese-1-failed.eml
+++ b/unittest/data/summary/input/6094-japanese-1.eml
diff --git a/unittest/data/summary/input/989-encoding-5-failed.eml b/unittest/data/summary/input/989-encoding-5.eml
index 166295cf..166295cf 100644
--- a/unittest/data/summary/input/989-encoding-5-failed.eml
+++ b/unittest/data/summary/input/989-encoding-5.eml
diff --git a/unittest/data/summary/output/2765-korean.txt b/unittest/data/summary/output/2765-korean.txt
new file mode 100644
index 00000000..bca9138c
--- /dev/null
+++ b/unittest/data/summary/output/2765-korean.txt
@@ -0,0 +1,8 @@
+From:=?ks_c_5601-1987?B?wMy8urz2?=ss.lee@gph.me
+To:=?ks_c_5601-1987?B?J7Czud/GwCc=?=dev@gph.me
+Subject:errorlog 정리
+Date:December 31, 2000 at 4:00:00 PM PST
+
+
+sdf sakhjasgsdfg
+dfsg kjsdfg kslfg
diff --git a/unittest/data/summary/output/3424-encoding.txt b/unittest/data/summary/output/3424-encoding.txt
new file mode 100644
index 00000000..2798abd4
--- /dev/null
+++ b/unittest/data/summary/output/3424-encoding.txt
@@ -0,0 +1,11 @@
+From:Almatytelecom<info@almatytelecom.kz>
+To:tulkibayev@gmail.com
+Subject:повторно за май - Message From Almatytelecom
+Date:June 23, 2011 at 4:05:29 AM PDT
+
+
+Вам выставлен счет № 258680047 от 31.05.2011 на сумму 6843,88 тенге. Счет полностью оплачен. Благодарим Вас за своевременную оплату счетов !
+ГЦТ Алматытелеком
+- bill.1.jpg, 301.3 KB
+- bill.txt, 5 KB
+
diff --git a/unittest/data/summary/output/6094-japanese-1.txt b/unittest/data/summary/output/6094-japanese-1.txt
new file mode 100644
index 00000000..a02e24cd
--- /dev/null
+++ b/unittest/data/summary/output/6094-japanese-1.txt
@@ -0,0 +1,166 @@
+From:"うるの拓也"<uruno@urutaku.com>
+To:Undisclosed recipient
+Subject:緊急ミーティング
+Date:June 10, 2012 at 7:05:22 PM PDT
+
+
+うるのです。
+
+どの日でもいいですよ。そっちの都合に合わせます。
+ただ、グッズの販売に関しては、常駐のスタッフがいないとキビシイ
+だろうと思うんだよね・・・。
+
+※デイズタウンを運営する広沢グループは、カネを出さないことで有名。
+　ボクもデイズタウンに呼ばれて、広報企画のアドバイスを求められた
+　ことがあるんだけど、一切カネ出さないんだよ。
+　広沢グループの会長さんは、広報というものをまるっきり無視していて、
+　デザイン費なんか絶対に認めない。手書きでも何でも書いてあればいい
+　というタイプなの（だから広沢関連の看板などは、みんなヒドイ）。
+　現場の人々（常務クラス）は、多少のお金は出したいと考えているけど、
+　トップが今までにそれを許した例はない。
+　とにかく、そういう相手だから、どんなに親しくしても資金は絶対に
+　出ないと考えていい。何をやるとしても、全部こっちで負担しなきゃ
+　ならないわけだ。
+
+※ボクとしてはカネはいらない、デイズタウンの集客のためにも協力する、
+　でいいと思っている。そのかわり、空いている場所を無償で提供しても
+　らいたい。特に、デイズタウン屋上には小さなステージがあるんだ。
+　屋根付きで、元々、落語とか何かの発表会とかミニライブとか、そういう
+　ことのためのステージが。今回はそこの話ではないんだけど、今回のこと
+　をきっかけに、ステージを、空いているときには無償で借りられる関係に
+　育ててしまいたいの。
+　で、500円とか1000円の入場料を取って、イバライガーがイベントできる
+　ようにしてしまいたい。デイズタウンがカネ出さないなら自分で稼ぐから、
+　場所を貸せ、と。あそこなら基地から近いし、十分なパーキングもある。
+　都合がいいんだよね。
+　いつでも自主ショーできるホームグラウンドにしてしまいたいわけ。
+　（それにソーラン連中には絶対に協力しないと表明してるらしいし）
+
+　ホームグラウンドがあればスケジュールが空いているときは、いつでも
+　何かやることができる。ぶっちゃけショーでなくともトークライブでも
+　いいわけだし、金曜の夜とかね、大人相手でやることもできる。
+　さらに支援者を募るための講演とかね、そういうこともできる。
+　500円でも100人なら5万円、1000円なら10万円だ。
+　毎月2～4公演もやれば、正当なギャラがもらえなくて不足してしまう
+　出動の穴埋めくらいはできるだろう。年商で300万くらいは作れるはず。
+　
+　お金が動かないなら、デイズタウンの現場レベルの判断で動けるんじゃ
+　ないかと思うの。もしそうなら、こうした条件で交渉できるように思える。
+　（イベントやったときは、その前後に店内練り歩きをしたりして、
+　ちゃんとデイズタウンの集客に協力するし、広告などにイバライガーが
+　出るのも認めてあげればいい）
+
+
+　写真展は、そのための試金石だと思う。
+　たまたま写真展をやるんじゃなくて、そのことが今後につながるように
+　仕向けたい。
+
+　（ちなみに、デイズだけじゃなくて、同じような条件で受け入れてくれる
+　場所を各地に募るための試金石でもある。テナント空いているなら、
+　イバライガーに無償で貸してしまえばいい。そうすれば、他のテナントに
+　客が来るようにしてくれる、と。そういう評判を作ってしまいたいわけ。
+　ジョイフルなんかも、その１つだと思うのだけど、あそこではイバが何か
+　することができないから単なるパフォーマンスでしかなくて、そのパフォ
+　でショーなどの仕事を得るという形しか考えられない。
+　それはそれでいいのだけど、ボクとしてはイバライガー自身が自分で
+　お金を作り出せる方法を獲得したい。自主イベントが自由にできる場所が
+　県内に数箇所あれば、今の年商に匹敵するくらいのお金を作れる。
+　そうすれば今年はグッズも増えているし、全部の合算で3000万円くらいは
+　届くはずだ。それでもまだまだ足りないんだけど、今の倍の収入になるん
+　だから、少なくとも銀行に口座を差し押さえられたりはしないで済むと
+　思うの）
+
+※また、ボクやＩＢＳでもやれるイバライガー企画というのを生みだすのも、
+　この企画の目的の１つ。イバライガー自身は動かさなくても、イバライガ
+　ーのイベントができる、という形を作りたい。
+　グッズや写真でやれる企画なら、こっちだけでやれて、その成果をイバに
+　バックしてやればいいし、ＩＢＳの活動費に回してもいい。
+　常設の「コミケ企業ブース」みたいなことができれば、それを武器にして、
+　物販でも何でもできるしね。空きテナントの有効活用ってことなら、それ
+　自体をフランチャイズしていく方法もあるはずだ。
+
+　目先の企画１回をどうするというよりも、ソレをやったら、コレになって、
+　さらにそれはアレにつながる、というふうに戦略的に考えたい。
+　狙い通りに進むとは思えないけど、やらなきゃ何にもならないんだし、
+　上手くハマればデカい動きにもできるはず。吉田さんやボクがそれで食え
+　ちゃうくらいにまでね。
+
+　（ぶっちゃけ、ＷＥＢの相談とか問い合わせも、そういう場所で受付でき
+　るようにしちゃえばいいんだし。集客してやるからテナントを無償で貸せ、
+　がイバの理屈なんだから、ボクらもイバをなんとかしてやるから、こっち
+　の商売にも利用させろ、で構わないはずだ。
+　ＷＥＢやデザインの商売なんてのは、一般人には何だか良く分からない
+　類いのものだから、イバのショールーム＝ボクらのショールームにも
+　できるだろう。そうしてやることで、同業の支援者を集めることもできる
+　と思うし、それがつながってクリエイターのネットワークを構築できる
+　かもしれない。その中心にイバライガーってことで、グッズの企画や
+　映像作品作りなどのスタッフにも困らなくなるかもしれない。
+　どれもこれも「獲らぬたぬき」だけど、そういう可能性までスポイルでき
+　るようにしてこそ支援者は支援を続けられるんだし、ボクらはそこまで
+　考えておきたいわけ。考えた上で、まずはデイズタウンなんだ）
+
+
+
+
+> うるのさん
+> 
+> お疲れ様です、吉田です。
+> 
+> 定例ミーティングではなく特別なやつをやります。
+> 
+> 議題は『イバライガー写真展について』です。
+> 
+> 「デイズタウンつくば」に空きテナントがあり、そこが開いている間に写真展をやろう
+> という話を、卯都木さんから頂きました。
+> 
+> そこで、早いうちに企画を作ってしまおうということで緊急ミーティングを行いますの
+> で
+> 6/12(火)～6/14(木)で都合の良い時間ありませんか？
+> 
+> 当日は写真展の企画についてミーティングと、視察（デイズタウンの空きテナント）に
+> も行きたいと思っています。
+> 
+> 今のところ企画としては
+> ・展示写真の公募
+> ・グッズの展示、販売
+> ・こどもぬりえコーナー＆展示
+> ・イバライガーパネル展示
+> ・写真には表彰＆賞品など
+> 
+> 以上のあたりを考えています。
+> 
+> よろしくお願いいたします。
+> 
+> 追伸：夏コミに「イバライガー後援会」当選しましたのでそれに向けて、写真集第2弾
+> を制作したいと思います。
+> 写真の収集はクラスタの皆さんにお願いしてDVDなどにて集めていますので、また編集
+> をお願いしても宜しいでしょうか？
+> 
+> 
+> ⇒⇒⇒⇒[I.B.S.] イバライガー後援会⇒⇒⇒⇒
+> Mail: iba.b.systems@gmail.com
+> 代表:吉田 学
+> 
+> 連絡先(個人)
+> Mail: yoshimana@gmail.com
+> TEL: 090-3900-0242
+> ⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒⇒
+> 
+> 
+
+
+
+
+デザイン/イラスト/コミック/DTP/プランニング/WEB
+━━━━━━━━━━━━━━━━━━━━━━━━━━━
+うるのクリエイティブ事務所
+━━━━━━━━━━━━━━━━━━━━━━━━━━━
+代表　うるの拓也（Takuya Uruno）
+───────────────────────────
+〒300-0843
+茨城県土浦市中村南3-4-19グリーンヴィラ土浦203
+TEL・FAX ■ 029-842-0929
+web site ■ http://www.urutaku.com
+電子mail ■ uruno@urutaku.com
+───────────────────────────
+
diff --git a/unittest/data/summary/output/989-encoding-5.txt b/unittest/data/summary/output/989-encoding-5.txt
new file mode 100644
index 00000000..ae85d4f1
--- /dev/null
+++ b/unittest/data/summary/output/989-encoding-5.txt
@@ -0,0 +1,67 @@
+From:Marina Khonina<marina.khonina@gmail.com>
+To:Elena Dmitrieva<law@gc-osnova.ru>
+Subject:услуги перевода в Турции
+Date:October 18, 2010 at 3:18:59 AM PDT
+
+
+Здравствуйте, Елена!
+
+Спасибо за ваше сообщение. На 1-3 ноября у меня других планов нет, и я уже внесла ваше мероприятие в мое расписание на следующий месяц.
+
+Я хотела бы уточнить, какой именно вид перевода вам понадобится на выставке. Если я не ошибаюсь, в своем первом сообщении вы написали, что потребуется синхронный перевод. Из нашей переписки у меня сложилось впечатление, что перевод необходим последовательный (т.е. без кабины и оборудования).
+
+Будьте добры, уточните пожалуйста, о каком именно ви� �е перевода идет речь.
+
+Заранее благодарю,
+Марина
+
+
+--
+Marina Khonina
+
+
+
+On Monday, 18 October 2010 at 9:29 , Elena Dmitrieva wrote:
+
+> 
+> Добрый день, Марина.
+> 
+> 
+> Я согласовала стоимость услуг с руководством.
+> 
+> 
+> Сегодня мы будем регистрировать их участие в выставке.
+> 
+> 
+> Возможно, нам надо будет Вас также сразу зарегистрировать. Об этом я сообщу попозже, если понадобятся Ваши данные.
+> 
+> 
+> Подтвердите, пожалуйста, что на 1-3 ноября у вас нет других планов.
+> 
+> 
+> 
+> 
+> 
+> С Уважением,
+> 
+> 
+> Дмитриева Елена
+> 
+> 
+> тел. (4732) 61-00-83
+> 
+> 
+> моб.+7920 218-50-33
+> 
+> 
+> law@gc-osnova.ru(mailto:law@gc-osnova.ru)
+> 
+> 
+> 
+> 
+> 
+> 
+> 
+> 
+
+
diff --git a/unittest/unittest.mm b/unittest/unittest.mm
index fa1798d1..ed5f94d5 100644
--- a/unittest/unittest.mm
+++ b/unittest/unittest.mm
@@ -26,11 +26,11 @@
 
 - (void) prepareForUnitTest
 {
-    if ([[self date] timeIntervalSinceNow] <= 2) {
+    if (fabs([[self date] timeIntervalSinceNow]) <= 2) {
         // Date might be generated, set to known date.
         [self setDate:[NSDate dateWithTimeIntervalSinceReferenceDate:0]];
     }
-    if ([[self receivedDate] timeIntervalSinceNow] <= 2) {
+    if (fabs([[self receivedDate] timeIntervalSinceNow]) <= 2) {
         // Date might be generated, set to known date.
         [self setReceivedDate:[NSDate dateWithTimeIntervalSinceReferenceDate:0]];
     }
@@ -224,6 +224,7 @@
         }
         NSData * data = [NSData dataWithContentsOfFile:path];
         MCOMessageParser * parser = [MCOMessageParser messageParserWithData:data];
+        [[parser header] prepareForUnitTest];
         NSString * str = [parser plainTextRendering];
 
 //        NSString * outputPath = [@"/Users/hoa/mc2-results/summary" stringByAppendingPathComponent:name];
author	Hoa V. Dinh <dinh.viet.hoa@gmail.com>	2014-11-05 18:24:12 -0800
committer	Hoa V. Dinh <dinh.viet.hoa@gmail.com>	2014-11-05 18:24:12 -0800
commit	d4799b94e4d99135a153f6304e0696256360353a (patch)
tree	51e2f2dfb7e65269f6c8105292d72058a1adf4fe /unittest
parent	c3727496446f2aba63b3a032e551c76eb28db5eb (diff)