Fixed unit tests

15 files changed, 15 insertions, 15 deletions

diff --git a/unittest/data/parser/output/mbox/jwz/105 b/unittest/data/parser/output/mbox/jwz/105
index 642c5882..280442bb 100644
--- a/unittest/data/parser/output/mbox/jwz/105
+++ b/unittest/data/parser/output/mbox/jwz/105
@@ -1 +1 @@
-{"header":{"from":{"class":"mailcore::Address","mailbox":"blaker@craswell.com"},"extraHeaders":{"Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"enrypted","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":{"from":{"class":"mailcore::Address","mailbox":"blaker@craswell.com"},"extraHeaders":{"Content-Type":"application\/x-pkcs7-mime; name=\"smime.p7m\"","MIME-Version":"1.0","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"enrypted","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m","attachment":"1"}}
\ 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 b7d0d7e3..4d72f75b 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":"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
+{"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","attachment":"1"}]}}}
\ 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 b6fc7d68..f90fcf28 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":"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
+{"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","attachment":"1"}}
\ 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 1611843b..092c7a21 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":"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
+{"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","attachment":"1"}]}}}
\ 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 9ea7692e..0a8c7d76 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":"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
+{"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","attachment":"1"}}
\ No newline at end of file
diff --git a/unittest/data/parser/output/mbox/jwz/115 b/unittest/data/parser/output/mbox/jwz/115
index 30f9d2d9..40e6a96c 100644
--- a/unittest/data/parser/output/mbox/jwz/115
+++ b/unittest/data/parser/output/mbox/jwz/115
@@ -1 +1 @@
-{"header":{"to":{"class":"mailcore::Array","items":[{"class":"mailcore::Address","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":"0000","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"encrypted and signed","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","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":"0000","Content-Disposition":"attachment; filename=\"smime.p7m\"","Content-Transfer-Encoding":"base64","X-Mailer":"Mozilla 3.0 (X11; U; IRIX 6.2 IP22)","Organization":"Netscape Communications Corporation, Mozilla Division"},"date":"978307200","messageID":"MyMessageID123@mail.gmail.com","receivedDate":"978307200","subject":"encrypted and signed","class":"mailcore::MessageHeader"},"class":"mailcore::MessageParser","mainPart":{"partType":"single","uniqueID":"0","mimeType":"application\/x-pkcs7-mime","class":"mailcore::Attachment","filename":"smime.p7m","attachment":"1"}}
\ 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 a2c9ee73..f20c61f2 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":"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
+{"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","attachment":"1"}]}}}
\ 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 50ee6ee2..11e24e4f 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":"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
+{"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","attachment":"1"}}
\ 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 ee6e96a7..4deb86a6 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":"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
+{"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","attachment":"1"}]}}}
\ 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 7251ab0e..a126e33e 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":"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
+{"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","attachment":"1"}}
\ 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 b68fe6b8..c5c5962f 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":"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
+{"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","attachment":"1"}]}}}
\ 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 ffa4f626..5d1c1dbc 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":"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
+{"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","attachment":"1"},{"partType":"single","uniqueID":"2","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"Aete_Editor_b1","attachment":"1"}]}}]}}}
\ 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 ffa4f626..5d1c1dbc 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":"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
+{"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","attachment":"1"},{"partType":"single","uniqueID":"2","mimeType":"application\/octet-stream","class":"mailcore::Attachment","filename":"Aete_Editor_b1","attachment":"1"}]}}]}}}
\ 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 f8e26c11..8a8ebda2 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":"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
+{"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","attachment":"1"},{"partType":"single","uniqueID":"1","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"two.gif","attachment":"1"},{"partType":"single","uniqueID":"2","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"three.gif","attachment":"1"},{"partType":"single","uniqueID":"3","mimeType":"image\/gif","class":"mailcore::Attachment","filename":"four.gif","attachment":"1"},{"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","attachment":"1"}]}}}
\ 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 002cf972..e0474c96 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":"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
+{"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","attachment":"1"}]}}}
\ No newline at end of file