diff --git a/Cargo.lock b/Cargo.lock
index 11611c7..9f653ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,8 +50,8 @@ dependencies = [
  "log",
  "mail-parser 0.4.8 (git+https://github.com/superboum/mail-parser?branch=feature/no_decode)",
  "mail-parser 0.4.8 (git+https://github.com/superboum/mail-parser?rev=db61a03)",
- "mail-parser 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "mail-parser 0.5.0 (git+https://github.com/stalwartlabs/mail-parser?branch=main)",
+ "mail-parser 0.5.0",
+ "mail-parser 0.8.2",
  "rand",
  "rmp-serde",
  "rpassword",
@@ -1355,8 +1355,7 @@ dependencies = [
 [[package]]
 name = "mail-parser"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e25e9e9cd1360538e0ca33499f12fd180f3611d7a8e1a50b7e4e43a4c5dd4b7"
+source = "git+https://github.com/stalwartlabs/mail-parser?branch=main#bb0e3366daabec8d2f94afd22c661394f9ba7cbe"
 dependencies = [
  "encoding_rs",
  "serde",
@@ -1364,11 +1363,11 @@ dependencies = [
 
 [[package]]
 name = "mail-parser"
-version = "0.5.0"
-source = "git+https://github.com/stalwartlabs/mail-parser?branch=main#bb0e3366daabec8d2f94afd22c661394f9ba7cbe"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4158a1c18963244e083888b21465846dfb68d6170850ed1ab4742edd57c9d47"
 dependencies = [
  "encoding_rs",
- "serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 2f41cb0..2ad8fc1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ itertools = "0.10"
 lazy_static = "1.4"
 ldap3 = { version = "0.10", default-features = false, features = ["tls"] }
 log = "0.4"
-mail-parser = "0.5"
+mail-parser = "0.8.2"
 rusoto_core = "0.48.0"
 rusoto_credential = "0.48.0"
 rusoto_s3 = "0.48"
diff --git a/src/imap/mailbox_view.rs b/src/imap/mailbox_view.rs
index 13ea9a7..028ed09 100644
--- a/src/imap/mailbox_view.rs
+++ b/src/imap/mailbox_view.rs
@@ -308,7 +308,7 @@ impl MailboxView {
                         )))
                     }
                     FetchAttribute::Rfc822Text => {
-                        let rp = parsed.get_root_part();
+                        let rp = parsed.root_part();
                         let r = parsed
                             .raw_message
                             .get(rp.offset_body..rp.offset_end)
@@ -332,10 +332,10 @@ impl MailboxView {
                         attributes.push(MessageAttribute::Envelope(message_envelope(&parsed)))
                     }
                     FetchAttribute::Body => attributes.push(MessageAttribute::Body(
-                        build_imap_email_struct(&parsed, parsed.get_root_part())?,
+                        build_imap_email_struct(&parsed, parsed.root_part())?,
                     )),
                     FetchAttribute::BodyStructure => attributes.push(MessageAttribute::Body(
-                        build_imap_email_struct(&parsed, parsed.get_root_part())?,
+                        build_imap_email_struct(&parsed, parsed.root_part())?,
                     )),
                     FetchAttribute::BodyExt {
                         section,
@@ -610,26 +610,26 @@ fn string_to_flag(f: &str) -> Option<Flag> {
 //@FIXME return an error if the envelope is invalid instead of panicking
 //@FIXME some fields must be defaulted if there are not set.
 fn message_envelope(msg: &mail_parser::Message<'_>) -> Envelope {
-    let from = convert_addresses(msg.get_from()).unwrap_or(vec![]);
+    let from = convert_addresses(msg.from()).unwrap_or(vec![]);
 
     Envelope {
         date: NString(
-            msg.get_date()
-                .map(|d| IString::try_from(d.to_iso8601()).unwrap()),
+            msg.date()
+                .map(|d| IString::try_from(d.to_rfc3339()).unwrap()),
         ),
         subject: NString(
-            msg.get_subject()
+            msg.subject()
                 .map(|d| IString::try_from(d.to_string()).unwrap()),
         ),
         from: from.clone(),
-        sender: convert_addresses(msg.get_sender()).unwrap_or(from.clone()),
-        reply_to: convert_addresses(msg.get_reply_to()).unwrap_or(from.clone()),
-        to: convert_addresses(msg.get_to()).unwrap_or(vec![]),
-        cc: convert_addresses(msg.get_cc()).unwrap_or(vec![]),
-        bcc: convert_addresses(msg.get_bcc()).unwrap_or(vec![]),
+        sender: convert_addresses(msg.sender()).unwrap_or(from.clone()),
+        reply_to: convert_addresses(msg.reply_to()).unwrap_or(from.clone()),
+        to: convert_addresses(msg.to()).unwrap_or(vec![]),
+        cc: convert_addresses(msg.cc()).unwrap_or(vec![]),
+        bcc: convert_addresses(msg.bcc()).unwrap_or(vec![]),
         in_reply_to: NString(None), // @TODO
         message_id: NString(
-            msg.get_message_id()
+            msg.message_id()
                 .map(|d| IString::try_from(d.to_string()).unwrap()),
         ),
     }
@@ -642,12 +642,6 @@ fn convert_addresses(a: &mail_parser::HeaderValue<'_>) -> Option<Vec<Address>> {
             Some(l.iter().map(|a| convert_address(a)).collect())
         }
         mail_parser::HeaderValue::Empty => None,
-        mail_parser::HeaderValue::Collection(c) => Some(
-            c.iter()
-                .map(|l| convert_addresses(l).unwrap_or(vec![]))
-                .flatten()
-                .collect(),
-        ),
         _ => {
             tracing::warn!("Invalid address header");
             None
@@ -698,10 +692,10 @@ fn build_imap_email_struct<'a>(msg: &Message<'a>, part: &MessagePart<'a>) -> Res
     match &part.body {
         PartType::Multipart(parts) => {
             let subtype = IString::try_from(
-                part.headers_rfc
-                    .get(&RfcHeader::ContentType)
+                part.headers
+                    .rfc(&RfcHeader::ContentType)
                     .ok_or(anyhow!("Content-Type is missing but required here."))?
-                    .get_content_type()
+                    .content_type()
                     .c_subtype
                     .as_ref()
                     .ok_or(anyhow!("Content-Type invalid, missing subtype"))?
@@ -741,7 +735,7 @@ fn build_imap_email_struct<'a>(msg: &Message<'a>, part: &MessagePart<'a>) -> Res
             // MUST be defined and hence has no default. But mail-parser does not make any
             // difference between MIME and raw emails, hence raw emails have no subtypes.
             let subtype = part
-                .get_content_type()
+                .content_type()
                 .map(|h| h.c_subtype.as_ref())
                 .flatten()
                 .map(|st| IString::try_from(st.to_string()).ok())
@@ -770,7 +764,7 @@ fn build_imap_email_struct<'a>(msg: &Message<'a>, part: &MessagePart<'a>) -> Res
             let (_, basic) = headers_to_basic_fields(&part, bp.len())?;
 
             let ct = part
-                .get_content_type()
+                .content_type()
                 .ok_or(anyhow!("Content-Type is missing but required here."))?;
 
             let type_ = IString::try_from(ct.c_type.as_ref().to_string()).map_err(|_| {
@@ -795,31 +789,22 @@ fn build_imap_email_struct<'a>(msg: &Message<'a>, part: &MessagePart<'a>) -> Res
                 extension: None,
             })
         }
-        PartType::Message(bp) => {
-            // @NOTE in some cases mail-parser does not parse the MessageAttachment but
-            // provide it as raw body. By looking quickly at the code, it seems that the
-            // attachment is not parsed when mail-parser encounters some encoding problems.
-            match &bp {
-                MessageAttachment::Parsed(inner) => {
-                    // @FIXME+BUG mail-parser does not handle ways when a MIME message contains
-                    // a raw email and wrongly take its delimiter. The size and number of
-                    // lines returned in that case are wrong. A patch to mail-parser is
-                    // needed to fix this.
-                    let (_, basic) = headers_to_basic_fields(&part, inner.raw_message.len())?;
+        PartType::Message(inner) => {
+            let (_, basic) = headers_to_basic_fields(&part, inner.raw_message().len())?;
 
-                    // We do not count the number of lines but the number of line
-                    // feeds to have the same behavior as Dovecot and Cyrus.
-                    // 2 lines = 1 line feed.
-                    let nol = inner.raw_message.iter().filter(|&c| c == &b'\n').count();
+            // We do not count the number of lines but the number of line
+            // feeds to have the same behavior as Dovecot and Cyrus.
+            // 2 lines = 1 line feed.
+            let nol = inner.raw_message().iter().filter(|&c| c == &b'\n').count();
 
-                    Ok(BodyStructure::Single {
-                        body: FetchBody {
-                            basic,
-                            specific: SpecificFields::Message {
-                                envelope: message_envelope(inner),
-                                body_structure: Box::new(build_imap_email_struct(
-                                    &inner,
-                                    inner.get_root_part(),
+            Ok(BodyStructure::Single {
+                body: FetchBody {
+                    basic,
+                    specific: SpecificFields::Message {
+                        envelope: message_envelope(inner),
+                        body_structure: Box::new(build_imap_email_struct(
+                                &inner,
+                                inner.root_part(),
                                 )?),
 
                                 // @FIXME This solution is bad for 2 reasons:
@@ -829,42 +814,10 @@ fn build_imap_email_struct<'a>(msg: &Message<'a>, part: &MessagePart<'a>) -> Res
                                 // - It should be done during parsing, we are iterating twice on
                                 // the same data which results in some wastes.
                                 number_of_lines: u32::try_from(nol)?,
-                            },
-                        },
-                        extension: None,
-                    })
-                }
-                MessageAttachment::Raw(raw_msg) => {
-                    let (_, basic) = headers_to_basic_fields(&part, raw_msg.len())?;
-
-                    let ct = part
-                        .get_content_type()
-                        .ok_or(anyhow!("Content-Type is missing but required here."))?;
-
-                    let type_ =
-                        IString::try_from(ct.c_type.as_ref().to_string()).map_err(|_| {
-                            anyhow!("Unable to build IString from given Content-Type type given")
-                        })?;
-
-                    let subtype = IString::try_from(
-                        ct.c_subtype
-                            .as_ref()
-                            .ok_or(anyhow!("Content-Type invalid, missing subtype"))?
-                            .to_string(),
-                    )
-                    .map_err(|_| {
-                        anyhow!("Unable to build IString from given Content-Type subtype given")
-                    })?;
-
-                    Ok(BodyStructure::Single {
-                        body: FetchBody {
-                            basic,
-                            specific: SpecificFields::Basic { type_, subtype },
-                        },
-                        extension: None,
-                    })
-                }
-            }
+                    },
+                },
+                extension: None,
+            })
         }
     }
 }
@@ -896,7 +849,7 @@ struct SpecialAttrs<'a> {
 fn attrs_to_params<'a>(bp: &impl MimeHeaders<'a>) -> (SpecialAttrs, Vec<(IString, IString)>) {
     // Try to extract Content-Type attributes from headers
     let attrs = match bp
-        .get_content_type()
+        .content_type()
         .map(|c| c.attributes.as_ref())
         .flatten()
     {
@@ -942,13 +895,13 @@ fn headers_to_basic_fields<'a>(
         parameter_list,
 
         id: NString(
-            bp.get_content_id()
+            bp.content_id()
                 .map(|ci| IString::try_from(ci.to_string()).ok())
                 .flatten(),
         ),
 
         description: NString(
-            bp.get_content_description()
+            bp.content_description()
                 .map(|cd| IString::try_from(cd.to_string()).ok())
                 .flatten(),
         ),
@@ -959,7 +912,7 @@ fn headers_to_basic_fields<'a>(
          * Content-Transfer-Encoding header field is not present.
          */
         content_transfer_encoding: bp
-            .get_content_transfer_encoding()
+            .content_transfer_encoding()
             .map(|h| IString::try_from(h.to_string()).ok())
             .flatten()
             .unwrap_or(unchecked_istring("7bit")),
@@ -976,7 +929,7 @@ fn get_message_section<'a>(
 ) -> Result<Cow<'a, [u8]>> {
     match section {
         Some(FetchSection::Text(None)) => {
-            let rp = parsed.get_root_part();
+            let rp = parsed.root_part();
             Ok(parsed
                 .raw_message
                 .get(rp.offset_body..rp.offset_end)
@@ -987,7 +940,7 @@ fn get_message_section<'a>(
         }
         Some(FetchSection::Text(Some(part))) => {
             map_subpart_msg(parsed, part.0.as_slice(), |part_msg| {
-                let rp = part_msg.get_root_part();
+                let rp = part_msg.root_part();
                 Ok(part_msg
                     .raw_message
                     .get(rp.offset_body..rp.offset_end)
@@ -1002,7 +955,7 @@ fn get_message_section<'a>(
             parsed,
             part.as_ref().map(|p| p.0.as_slice()).unwrap_or(&[]),
             |part_msg| {
-                let rp = part_msg.get_root_part();
+                let rp = part_msg.root_part();
                 Ok(part_msg
                     .raw_message
                     .get(..rp.offset_body)
@@ -1031,13 +984,13 @@ fn get_message_section<'a>(
                 part.as_ref().map(|p| p.0.as_slice()).unwrap_or(&[]),
                 |part_msg| {
                     let mut ret = vec![];
-                    for (hn, hv) in part_msg.get_raw_headers() {
+                    for (hn, hv) in part_msg.headers_raw() {
                         if fields
                             .as_slice()
                             .iter()
-                            .any(|x| (*x == hn.as_str().as_bytes()) ^ invert)
+                            .any(|x| (*x == hn.as_bytes()) ^ invert)
                         {
-                            ret.extend(hn.as_str().as_bytes());
+                            ret.extend(hn.as_bytes());
                             ret.extend(b": ");
                             ret.extend(hv.as_bytes());
                         }
@@ -1051,18 +1004,17 @@ fn get_message_section<'a>(
             let bytes = match &part.body {
                 PartType::Text(p) | PartType::Html(p) => p.as_bytes().to_vec(),
                 PartType::Binary(p) | PartType::InlineBinary(p) => p.to_vec(),
-                PartType::Message(MessageAttachment::Raw(r)) => r.to_vec(),
-                PartType::Message(MessageAttachment::Parsed(p)) => p.raw_message.to_vec(),
+                PartType::Message(p) => p.raw_message.to_vec(),
                 PartType::Multipart(_) => bail!("Multipart part has no body"),
             };
             Ok(bytes.into())
         }),
         Some(FetchSection::Mime(part)) => map_subpart(parsed, part.0.as_slice(), |msg, part| {
             let mut ret = vec![];
-            for (name, body) in part.headers_raw.iter() {
-                ret.extend(name.as_str().as_bytes());
+            for head in part.headers.iter() {
+                ret.extend(head.name.as_str().as_bytes());
                 ret.extend(b": ");
-                ret.extend(&msg.raw_message[body.start..body.end]);
+                ret.extend(&msg.raw_message[head.offset_start..head.offset_end]);
             }
             ret.extend(b"\r\n");
             Ok(ret.into())
@@ -1082,11 +1034,8 @@ where
             .parts
             .get(path[0].get() as usize - 1)
             .ok_or(anyhow!("No such subpart: {}", path[0]))?;
-        if let PartType::Message(msg_attch) = &part.body {
-            let part_msg = msg_attch
-                .get_message()
-                .ok_or(anyhow!("Cannot parse subpart: {}", path[0]))?;
-            map_subpart_msg(&part_msg, &path[1..], f)
+        if let PartType::Message(msg_attach) = &part.body {
+            map_subpart_msg(&msg_attach, &path[1..], f)
         } else {
             bail!("Subpart is not a message: {}", path[0]);
         }
@@ -1107,11 +1056,8 @@ where
         if path.len() == 1 {
             f(msg, part)
         } else {
-            if let PartType::Message(msg_attch) = &part.body {
-                let part_msg = msg_attch
-                    .get_message()
-                    .ok_or(anyhow!("Cannot parse subpart: {}", path[0]))?;
-                map_subpart(&part_msg, &path[1..], f)
+            if let PartType::Message(msg_attach) = &part.body {
+                map_subpart(&msg_attach, &path[1..], f)
             } else {
                 bail!("Subpart is not a message: {}", path[0]);
             }
@@ -1135,15 +1081,19 @@ mod tests {
             "tests/emails/dxflrs/0001_simple",
             "tests/emails/dxflrs/0002_mime",
             "tests/emails/dxflrs/0003_mime-in-mime",
-            // broken: numbers of lines/characters not counted correctly
             "tests/emails/dxflrs/0004_msg-in-msg",
+
+            // wrong. base64?
             //"tests/emails/dxflrs/0005_mail-parser-readme",
 
-            // broken
-            //"tests/emails/dxflrs/0006_single-mime",
+            "tests/emails/dxflrs/0006_single-mime",
+
+            // panic - thread 'imap::mailbox_view::tests::fetch_body' panicked at 'range end index 128 out of range for slice of length 127', src/imap/mailbox_view.rs:798:64
             //"tests/emails/dxflrs/0007_raw_msg_in_rfc822",
 
-            //"tests/emails/rfc/000", // broken
+            // broken, wrong mimetype text, should be audio
+            // "tests/emails/rfc/000",
+            
             //  "tests/emails/rfc/001", // broken
             //  "tests/emails/rfc/002", // broken: dovecot adds \r when it is missing and count is as
             // a character. Difference on how lines are counted too.
@@ -1161,7 +1111,7 @@ mod tests {
             let message = Message::parse(&txt).unwrap();
 
             let mut resp = Vec::new();
-            MessageAttribute::Body(build_imap_email_struct(&message, message.get_root_part())?)
+            MessageAttribute::Body(build_imap_email_struct(&message, message.root_part())?)
                 .encode(&mut resp);
 
             let resp_str = String::from_utf8_lossy(&resp).to_lowercase();
@@ -1169,7 +1119,7 @@ mod tests {
             let exp_no_parenthesis = &exp[1..exp.len() - 1];
             let exp_str = String::from_utf8_lossy(exp_no_parenthesis).to_lowercase();
 
-            println!("aerogramme: {}\ndovecot:    {}", resp_str, exp_str);
+            println!("aerogramme: {}\n\ndovecot:    {}\n\n", resp_str, exp_str);
             //println!("\n\n {} \n\n", String::from_utf8_lossy(&resp));
             assert_eq!(resp_str, exp_str);
         }
diff --git a/src/mail/mailbox.rs b/src/mail/mailbox.rs
index df7ede9..a37c9ed 100644
--- a/src/mail/mailbox.rs
+++ b/src/mail/mailbox.rs
@@ -308,7 +308,7 @@ impl MailboxInternal {
             },
             async {
                 // Save mail meta
-                let mail_root = mail.parsed.get_root_part();
+                let mail_root = mail.parsed.root_part();
                 let meta = MailMeta {
                     internaldate: now_msec(),
                     headers: mail.raw[..mail_root.offset_body].to_vec(),
@@ -359,7 +359,7 @@ impl MailboxInternal {
             },
             async {
                 // Save mail meta
-                let mail_root = mail.parsed.get_root_part();
+                let mail_root = mail.parsed.root_part();
                 let meta = MailMeta {
                     internaldate: now_msec(),
                     headers: mail.raw[..mail_root.offset_body].to_vec(),
diff --git a/tests/README.md b/tests/README.md
index c932a0e..b479cf4 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -13,8 +13,12 @@ docker-compose up
     - listen on :994,  run `openssl s_client -connect 127.0.0.1:994`
     - login with `A LOGIN test@example.com pass`
   - Cyrus
-    - lient on :143, run `nc 127.0.0.1 143`
+    - listen on :143, run `nc 127.0.0.1 143`
     - login with `A LOGIN test pass`
+  - Stalwart
+    - listen on :1993, run `openssl s_client -connect 127.0.0.1:993`
+    - login with `A LOGIN test@example.com pass`
+    - note: not packaged in docker yet...
 
 Other IMAP servers we could add:
   - WildDuck (own node.js imap implementation)
diff --git a/tests/emails/dxflrs/0001_simple.stalwart.0.2.0.body b/tests/emails/dxflrs/0001_simple.stalwart.0.2.0.body
new file mode 100644
index 0000000..7942837
--- /dev/null
+++ b/tests/emails/dxflrs/0001_simple.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 49 1))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0001_simple.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0001_simple.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..b111d8c
--- /dev/null
+++ b/tests/emails/dxflrs/0001_simple.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 49 1 "ffd9b6292b7ea945513c94e06a2ce185" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0002_mime.stalwart.0.2.0.body b/tests/emails/dxflrs/0002_mime.stalwart.0.2.0.body
new file mode 100644
index 0000000..add1dde
--- /dev/null
+++ b/tests/emails/dxflrs/0002_mime.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 9 1) ("text" "html" ("charset" "utf-8") NIL NIL "8bit" 14 0) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0002_mime.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0002_mime.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..b8fce07
--- /dev/null
+++ b/tests/emails/dxflrs/0002_mime.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 9 1 "543c0bb2e3c0ad1d4c72a74b98b8a85c" NIL NIL NIL) ("text" "html" ("charset" "utf-8") NIL NIL "8bit" 14 0 "8a900064824e787edc6797b9d1b4157d" NIL NIL NIL) "alternative" ("boundary" "festivus") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0003_mime-in-mime.stalwart.0.2.0.body b/tests/emails/dxflrs/0003_mime-in-mime.stalwart.0.2.0.body
new file mode 100644
index 0000000..e1c98a7
--- /dev/null
+++ b/tests/emails/dxflrs/0003_mime-in-mime.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 9 1) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0) "mixed") ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0003_mime-in-mime.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0003_mime-in-mime.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..b007131
--- /dev/null
+++ b/tests/emails/dxflrs/0003_mime-in-mime.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 9 1 "543c0bb2e3c0ad1d4c72a74b98b8a85c" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0 "f15d33a1a1c5dc564c0c16959a296c00" NIL NIL NIL) "mixed" ("boundary" "child") NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0 "7e2f3ae2744db56ba99254f7c7ed9687" NIL NIL NIL) "mixed" ("boundary" "parent") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0004_msg-in-msg.stalwart.0.2.0.body b/tests/emails/dxflrs/0004_msg-in-msg.stalwart.0.2.0.body
new file mode 100644
index 0000000..760eb8e
--- /dev/null
+++ b/tests/emails/dxflrs/0004_msg-in-msg.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0) ("message" "rfc822" NIL NIL NIL NIL 129 (NIL "Welcome to Aerogramme!!" (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 49 1) 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0004_msg-in-msg.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0004_msg-in-msg.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..f9c7ecd
--- /dev/null
+++ b/tests/emails/dxflrs/0004_msg-in-msg.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0 "9cdbde8e26efc28156e810237b67b98c" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 129 (NIL "Welcome to Aerogramme!!" (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 49 1 "ffd9b6292b7ea945513c94e06a2ce185" NIL NIL NIL) 0 "a2d53b3dede0e8f7b3f62a4b8ed8c8f9" NIL NIL NIL) "mixed" ("boundary" "delim") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0005_mail-parser-readme.stalwart.0.2.0.body b/tests/emails/dxflrs/0005_mail-parser-readme.stalwart.0.2.0.body
new file mode 100644
index 0000000..b4993a4
--- /dev/null
+++ b/tests/emails/dxflrs/0005_mail-parser-readme.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "html" ("charset" "us-ascii") NIL NIL "base64" 242 3) ("message" "rfc822" NIL NIL NIL NIL 732 (NIL "Exporting my book about coffee tables" (("Cosmo Kramer" NIL "kramer" "kramerica.com")) (("Cosmo Kramer" NIL "kramer" "kramerica.com")) (("Cosmo Kramer" NIL "kramer" "kramerica.com")) NIL NIL NIL NIL NIL) (("text" "plain" ("charset" "utf-16") NIL NIL "quoted-printable" 231 3) ("image" "gif" ("name" "Book about coffe tables.gif") NIL NIL "Base64" 56) "mixed") 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0005_mail-parser-readme.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0005_mail-parser-readme.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..cac9eb3
--- /dev/null
+++ b/tests/emails/dxflrs/0005_mail-parser-readme.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "html" ("charset" "us-ascii") NIL NIL "base64" 242 3 "a1906bc9c7cba319b7a907b0f36a13d4" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 732 (NIL "Exporting my book about coffee tables" (("Cosmo Kramer" NIL "kramer" "kramerica.com")) (("Cosmo Kramer" NIL "kramer" "kramerica.com")) (("Cosmo Kramer" NIL "kramer" "kramerica.com")) NIL NIL NIL NIL NIL) (("text" "plain" ("charset" "utf-16") NIL NIL "quoted-printable" 231 3 "2b7039def3f1ac893044b2281c2cf75e" NIL NIL NIL) ("image" "gif" ("name" "Book about coffe tables.gif") NIL NIL "Base64" 56 "d40fa7f401e9dc2df56cbb740d65ff52" ("attachment" ()) NIL NIL) "mixed" ("boundary" "giddyup") NIL NIL NIL) 0 "127f062ee497d93fe570b8f88ba41103" NIL NIL NIL) "mixed" ("boundary" "festivus") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0006_single-mime.stalwart.0.2.0.body b/tests/emails/dxflrs/0006_single-mime.stalwart.0.2.0.body
new file mode 100644
index 0000000..1eec263
--- /dev/null
+++ b/tests/emails/dxflrs/0006_single-mime.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0006_single-mime.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0006_single-mime.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..6319e4e
--- /dev/null
+++ b/tests/emails/dxflrs/0006_single-mime.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 7 0 "9cdbde8e26efc28156e810237b67b98c" NIL NIL NIL) "alternative" ("boundary" "festivus") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0007_raw_msg_in_rfc822.stalwart.0.2.0.body b/tests/emails/dxflrs/0007_raw_msg_in_rfc822.stalwart.0.2.0.body
new file mode 100644
index 0000000..86de16a
--- /dev/null
+++ b/tests/emails/dxflrs/0007_raw_msg_in_rfc822.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("message" "rfc822" NIL NIL NIL NIL 127 (NIL "Welcome to Aerogramme!!" (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 47 0) 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/dxflrs/0007_raw_msg_in_rfc822.stalwart.0.2.0.bodystructure b/tests/emails/dxflrs/0007_raw_msg_in_rfc822.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..0769a67
--- /dev/null
+++ b/tests/emails/dxflrs/0007_raw_msg_in_rfc822.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("message" "rfc822" NIL NIL NIL NIL 127 (NIL "Welcome to Aerogramme!!" (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) (("Garage team" NIL "garagehq" "deuxfleurs.fr")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 47 0 "888e7b08e816955349c85db35da89630" NIL NIL NIL) 0 "acdcc32276ce167e9813cd589684d991" NIL NIL NIL) "mixed" ("boundary" "delim") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/000.stalwart.0.2.0.body b/tests/emails/legacy/000.stalwart.0.2.0.body
new file mode 100644
index 0000000..db3b477
--- /dev/null
+++ b/tests/emails/legacy/000.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("image" "png" ("name" "redball.png") NIL NIL "base64" 1994))
\ No newline at end of file
diff --git a/tests/emails/legacy/000.stalwart.0.2.0.bodystructure b/tests/emails/legacy/000.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..e5bb63d
--- /dev/null
+++ b/tests/emails/legacy/000.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("image" "png" ("name" "redball.png") NIL NIL "base64" 1994 "37f650e110fc1e33c7fff6580d5eeef1" ("attachment" ("filename" "redball.png")) NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/001.stalwart.0.2.0.body b/tests/emails/legacy/001.stalwart.0.2.0.body
new file mode 100644
index 0000000..6b58e25
--- /dev/null
+++ b/tests/emails/legacy/001.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "utf-7") NIL NIL "quoted-printable" 897 19))
\ No newline at end of file
diff --git a/tests/emails/legacy/001.stalwart.0.2.0.bodystructure b/tests/emails/legacy/001.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..abd3edd
--- /dev/null
+++ b/tests/emails/legacy/001.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "utf-7") NIL NIL "quoted-printable" 897 19 "b8a53054ee0c616c60265a3617a353a5" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/002.stalwart.0.2.0.body b/tests/emails/legacy/002.stalwart.0.2.0.body
new file mode 100644
index 0000000..1bb1b25
--- /dev/null
+++ b/tests/emails/legacy/002.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1001 25))
\ No newline at end of file
diff --git a/tests/emails/legacy/002.stalwart.0.2.0.bodystructure b/tests/emails/legacy/002.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..438dc30
--- /dev/null
+++ b/tests/emails/legacy/002.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1001 25 "99b26f1a019246d514b85bab4038d86a" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/003.stalwart.0.2.0.body b/tests/emails/legacy/003.stalwart.0.2.0.body
new file mode 100644
index 0000000..c7e3e31
--- /dev/null
+++ b/tests/emails/legacy/003.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 997 23) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/legacy/003.stalwart.0.2.0.bodystructure b/tests/emails/legacy/003.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..9eac617
--- /dev/null
+++ b/tests/emails/legacy/003.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16 "e4d418b6e9f4dbd62809b74b811246a7" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 997 23 "3042ac8495670f3f7e9d8c7315a90c39" NIL NIL NIL) "alternative" ("boundary" "=====================_714967308==_.ALT") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/004.stalwart.0.2.0.body b/tests/emails/legacy/004.stalwart.0.2.0.body
new file mode 100644
index 0000000..ce32e5f
--- /dev/null
+++ b/tests/emails/legacy/004.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 768 8))
\ No newline at end of file
diff --git a/tests/emails/legacy/004.stalwart.0.2.0.bodystructure b/tests/emails/legacy/004.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..d568582
--- /dev/null
+++ b/tests/emails/legacy/004.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 768 8 "33ee27b69c4f8c6c51f02bff37f38f4a" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/005.stalwart.0.2.0.body b/tests/emails/legacy/005.stalwart.0.2.0.body
new file mode 100644
index 0000000..9c9f327
--- /dev/null
+++ b/tests/emails/legacy/005.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "utf-7") NIL NIL "quoted-printable" 895 18))
\ No newline at end of file
diff --git a/tests/emails/legacy/005.stalwart.0.2.0.bodystructure b/tests/emails/legacy/005.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..54c71ec
--- /dev/null
+++ b/tests/emails/legacy/005.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "utf-7") NIL NIL "quoted-printable" 895 18 "0c6c2bb595ad676c120aeb6da98956c0" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/006.stalwart.0.2.0.body b/tests/emails/legacy/006.stalwart.0.2.0.body
new file mode 100644
index 0000000..532af14
--- /dev/null
+++ b/tests/emails/legacy/006.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/006.stalwart.0.2.0.bodystructure b/tests/emails/legacy/006.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..218e956
--- /dev/null
+++ b/tests/emails/legacy/006.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "3cda6111307ed1b70869902a649fc627" ("attachment" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992 "9ab8d3f2919159b36196a9addb0595f9" ("attachment" ("filename" "redball.png")) NIL NIL) "mixed" ("boundary" "----=_NextPart_000_0004_01BFC037.28F2FA90") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/007.stalwart.0.2.0.body b/tests/emails/legacy/007.stalwart.0.2.0.body
new file mode 100644
index 0000000..0da3296
--- /dev/null
+++ b/tests/emails/legacy/007.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 811 17))
\ No newline at end of file
diff --git a/tests/emails/legacy/007.stalwart.0.2.0.bodystructure b/tests/emails/legacy/007.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..e94c919
--- /dev/null
+++ b/tests/emails/legacy/007.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 811 17 "9697f984a3e63af99de12bc7e2493be3" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/008.stalwart.0.2.0.body b/tests/emails/legacy/008.stalwart.0.2.0.body
new file mode 100644
index 0000000..e8c7bc3
--- /dev/null
+++ b/tests/emails/legacy/008.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 799 15) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1778) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/008.stalwart.0.2.0.bodystructure b/tests/emails/legacy/008.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..648f4dd
--- /dev/null
+++ b/tests/emails/legacy/008.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 799 15 "dffa64383f7937a7e0523d5c4c866742" NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "3cda6111307ed1b70869902a649fc627" ("attachment" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1778 "262bf995464d74d0e5b276313b474e2d" ("attachment" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992 "9ab8d3f2919159b36196a9addb0595f9" ("attachment" ("filename" "redball.png")) NIL NIL) "mixed" ("boundary" "----=_NextPart_000_0002_01BFC036.AE309650") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/009.stalwart.0.2.0.body b/tests/emails/legacy/009.stalwart.0.2.0.body
new file mode 100644
index 0000000..2fb8365
--- /dev/null
+++ b/tests/emails/legacy/009.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1" "format" "flowed") NIL NIL "quoted-printable" 827 23))
\ No newline at end of file
diff --git a/tests/emails/legacy/009.stalwart.0.2.0.bodystructure b/tests/emails/legacy/009.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..251606b
--- /dev/null
+++ b/tests/emails/legacy/009.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1" "format" "flowed") NIL NIL "quoted-printable" 827 23 "06a83091cbfcc9730a4cb709d733589b" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/010.stalwart.0.2.0.body b/tests/emails/legacy/010.stalwart.0.2.0.body
new file mode 100644
index 0000000..44a32c6
--- /dev/null
+++ b/tests/emails/legacy/010.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "8bit" 751 10))
\ No newline at end of file
diff --git a/tests/emails/legacy/010.stalwart.0.2.0.bodystructure b/tests/emails/legacy/010.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..d53c57a
--- /dev/null
+++ b/tests/emails/legacy/010.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "8bit" 751 10 "51426e0cd88a34909f1db4b2d419163c" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/011.stalwart.0.2.0.body b/tests/emails/legacy/011.stalwart.0.2.0.body
new file mode 100644
index 0000000..9ca312e
--- /dev/null
+++ b/tests/emails/legacy/011.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 813 18))
\ No newline at end of file
diff --git a/tests/emails/legacy/011.stalwart.0.2.0.bodystructure b/tests/emails/legacy/011.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..b4cfa24
--- /dev/null
+++ b/tests/emails/legacy/011.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 813 18 "28683982b3c0313003e588417d859a58" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/012.stalwart.0.2.0.body b/tests/emails/legacy/012.stalwart.0.2.0.body
new file mode 100644
index 0000000..5170de5
--- /dev/null
+++ b/tests/emails/legacy/012.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "Windows-1252") NIL NIL "quoted-printable" 809 16))
\ No newline at end of file
diff --git a/tests/emails/legacy/012.stalwart.0.2.0.bodystructure b/tests/emails/legacy/012.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..be14b6e
--- /dev/null
+++ b/tests/emails/legacy/012.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "Windows-1252") NIL NIL "quoted-printable" 809 16 "519f35670439561a9c5edb5987a29d8f" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/013.stalwart.0.2.0.body b/tests/emails/legacy/013.stalwart.0.2.0.body
new file mode 100644
index 0000000..6b8e249
--- /dev/null
+++ b/tests/emails/legacy/013.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "8bit" 754 17))
\ No newline at end of file
diff --git a/tests/emails/legacy/013.stalwart.0.2.0.bodystructure b/tests/emails/legacy/013.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..9170e45
--- /dev/null
+++ b/tests/emails/legacy/013.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "8bit" 754 17 "7128e53dcbc2adef2a72a31d9ec16435" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/014.stalwart.0.2.0.body b/tests/emails/legacy/014.stalwart.0.2.0.body
new file mode 100644
index 0000000..1d30454
--- /dev/null
+++ b/tests/emails/legacy/014.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 801 16) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1190 27) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/legacy/014.stalwart.0.2.0.bodystructure b/tests/emails/legacy/014.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..a56eda2
--- /dev/null
+++ b/tests/emails/legacy/014.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 801 16 "a7d006003cbfba52de75eb678d6c4f60" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1190 27 "d1dd8af81c6a8d0ef4f1928b594b281f" NIL NIL NIL) "alternative" ("boundary" "----=_NextPart_000_0005_01BFC037.799BEF60") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/015.stalwart.0.2.0.body b/tests/emails/legacy/015.stalwart.0.2.0.body
new file mode 100644
index 0000000..ed2438d
--- /dev/null
+++ b/tests/emails/legacy/015.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 833 16) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1230 26) "alternative") ("image" "png" ("name" "2aa3ed95.png") "<4.2.0.58.20000519003556.00a918e0@pop.example.com.2>" NIL "base64" 1814) ("image" "png" ("name" "2aa3edd1.png") "<4.2.0.58.20000519003556.00a918e0@pop.example.com.3>" NIL "base64" 1990) "related") ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1776) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/015.stalwart.0.2.0.bodystructure b/tests/emails/legacy/015.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..b0efab0
--- /dev/null
+++ b/tests/emails/legacy/015.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 833 16 "d28296b9799d9521dafc255075108271" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1230 26 "d545ba0ee52aa926cec2c8d023558264" NIL NIL NIL) "alternative" ("boundary" "=====================_715392550==_.ALT") NIL NIL NIL) ("image" "png" ("name" "2aa3ed95.png") "<4.2.0.58.20000519003556.00a918e0@pop.example.com.2>" NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("inline" ("filename" "2aa3ed95.png")) NIL NIL) ("image" "png" ("name" "2aa3edd1.png") "<4.2.0.58.20000519003556.00a918e0@pop.example.com.3>" NIL "base64" 1990 "1577b0b5cc127cbdb47c68349709b939" ("inline" ("filename" "2aa3edd1.png")) NIL NIL) "related" ("type" "multipart/alternative" "boundary" "=====================_715392540==_.REL") NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("attachment" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1776 "a7bd1ed2cd36d0576a0d6b69e998e37b" ("attachment" ("filename" "greenball.png")) NIL NIL) "mixed" ("boundary" "=====================_715392540==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/016.stalwart.0.2.0.body b/tests/emails/legacy/016.stalwart.0.2.0.body
new file mode 100644
index 0000000..e7c439d
--- /dev/null
+++ b/tests/emails/legacy/016.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16) ("application" "mac-binhex40" ("name" "blueball.png") NIL NIL NIL 1929) ("application" "mac-binhex40" ("name" "HasenundFr�sche.txt") NIL NIL NIL 1131) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/016.stalwart.0.2.0.bodystructure b/tests/emails/legacy/016.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..05a6760
--- /dev/null
+++ b/tests/emails/legacy/016.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16 "e4d418b6e9f4dbd62809b74b811246a7" NIL NIL NIL) ("application" "mac-binhex40" ("name" "blueball.png") NIL NIL NIL 1929 "fa4e7925c8778cb9a4349bed7c7e7135" ("attachment" ("filename" "blueball.png")) NIL NIL) ("application" "mac-binhex40" ("name" "HasenundFr�sche.txt") NIL NIL NIL 1131 "14801ab055f8733a28b46a24dbe979c8" ("attachment" ("filename" "HasenundFr�sche.txt")) NIL NIL) "mixed" ("boundary" "=====================_716373961==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/017.stalwart.0.2.0.body b/tests/emails/legacy/017.stalwart.0.2.0.body
new file mode 100644
index 0000000..be67793
--- /dev/null
+++ b/tests/emails/legacy/017.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 764 6) ("image" "png" ("name" "greenball.png") NIL NIL "x-uuencode" 1854) ("image" "png" ("name" "blueball.png") NIL NIL "x-uuencode" 1892) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/017.stalwart.0.2.0.bodystructure b/tests/emails/legacy/017.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..51b6bcd
--- /dev/null
+++ b/tests/emails/legacy/017.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 764 6 "db214f1a330a0a06168c1375622c1f35" NIL NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "x-uuencode" 1854 "d72546f9299d3703ea2079239c7a2778" ("attachment" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "x-uuencode" 1892 "844e058d579021bb69992217807fcc1a" ("attachment" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "=====================_716177458==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/018.stalwart.0.2.0.body b/tests/emails/legacy/018.stalwart.0.2.0.body
new file mode 100644
index 0000000..619ad23
--- /dev/null
+++ b/tests/emails/legacy/018.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 836 18) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1238 27) "alternative") ("image" "png" ("name" "blueball.png") "<4.2.0.58.20000519003143.00a8d550@pop.example.com.0>" NIL "base64" 1814) ("image" "png" ("name" "redball.png") "<4.2.0.58.20000519003143.00a8d550@pop.example.com.1>" NIL "base64" 1990) "related"))
\ No newline at end of file
diff --git a/tests/emails/legacy/018.stalwart.0.2.0.bodystructure b/tests/emails/legacy/018.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..f223c06
--- /dev/null
+++ b/tests/emails/legacy/018.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 836 18 "d1f7796e627cd5c2a7b7e063c0f3bf0f" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1238 27 "04885a938cdd849bbd3ba8c1731957c0" NIL NIL NIL) "alternative" ("boundary" "=====================_715157141==_.ALT") NIL NIL NIL) ("image" "png" ("name" "blueball.png") "<4.2.0.58.20000519003143.00a8d550@pop.example.com.0>" NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("inline" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "redball.png") "<4.2.0.58.20000519003143.00a8d550@pop.example.com.1>" NIL "base64" 1990 "1577b0b5cc127cbdb47c68349709b939" ("inline" ("filename" "redball.png")) NIL NIL) "related" ("type" "multipart/alternative" "boundary" "=====================_715157131==_.REL") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/019.stalwart.0.2.0.body b/tests/emails/legacy/019.stalwart.0.2.0.body
new file mode 100644
index 0000000..80de01c
--- /dev/null
+++ b/tests/emails/legacy/019.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 801 16) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1190 27) "alternative") ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1778) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/019.stalwart.0.2.0.bodystructure b/tests/emails/legacy/019.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..8ddee7d
--- /dev/null
+++ b/tests/emails/legacy/019.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 801 16 "a7d006003cbfba52de75eb678d6c4f60" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1190 27 "604b5bc182795cf94bdbfcece7c8f555" NIL NIL NIL) "alternative" ("boundary" "----=_NextPart_001_0009_01BFC037.FDD8EE90") NIL NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1778 "262bf995464d74d0e5b276313b474e2d" ("attachment" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992 "9ab8d3f2919159b36196a9addb0595f9" ("attachment" ("filename" "redball.png")) NIL NIL) "mixed" ("boundary" "----=_NextPart_000_0008_01BFC037.FDD8EE90") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/020.stalwart.0.2.0.body b/tests/emails/legacy/020.stalwart.0.2.0.body
new file mode 100644
index 0000000..6b8e249
--- /dev/null
+++ b/tests/emails/legacy/020.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "8bit" 754 17))
\ No newline at end of file
diff --git a/tests/emails/legacy/020.stalwart.0.2.0.bodystructure b/tests/emails/legacy/020.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..9170e45
--- /dev/null
+++ b/tests/emails/legacy/020.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "8bit" 754 17 "7128e53dcbc2adef2a72a31d9ec16435" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/021.stalwart.0.2.0.body b/tests/emails/legacy/021.stalwart.0.2.0.body
new file mode 100644
index 0000000..d1fd5b7
--- /dev/null
+++ b/tests/emails/legacy/021.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 805 18) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1397 31) "alternative") ("image" "png" ("name" "blueball.png") "<938014623@17052000-0f9b>" NIL "base64" 1816) "related") ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1778) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/021.stalwart.0.2.0.bodystructure b/tests/emails/legacy/021.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..b964fad
--- /dev/null
+++ b/tests/emails/legacy/021.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 805 18 "8eafcdc1359d10ac4d1fdd526e1b6262" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1397 31 "ef26ab1c5b98134a9e32e3d335eb19f2" NIL NIL NIL) "alternative" ("boundary" "----=_NextPart_002_0012_01BFC038.B91BC650") NIL NIL NIL) ("image" "png" ("name" "blueball.png") "<938014623@17052000-0f9b>" NIL "base64" 1816 "3cda6111307ed1b70869902a649fc627" NIL NIL NIL) "related" ("boundary" "----=_NextPart_001_0011_01BFC038.B91BC650") NIL NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1778 "262bf995464d74d0e5b276313b474e2d" ("attachment" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992 "9ab8d3f2919159b36196a9addb0595f9" ("attachment" ("filename" "redball.png")) NIL NIL) "mixed" ("boundary" "----=_NextPart_000_0010_01BFC038.B91BC650") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/022.stalwart.0.2.0.body b/tests/emails/legacy/022.stalwart.0.2.0.body
new file mode 100644
index 0000000..7b1aef0
--- /dev/null
+++ b/tests/emails/legacy/022.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "base64" 1028 16))
\ No newline at end of file
diff --git a/tests/emails/legacy/022.stalwart.0.2.0.bodystructure b/tests/emails/legacy/022.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..e3ee9d6
--- /dev/null
+++ b/tests/emails/legacy/022.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "base64" 1028 16 "1804e49c49ec52f7f9ca70379c19166b" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/023.stalwart.0.2.0.body b/tests/emails/legacy/023.stalwart.0.2.0.body
new file mode 100644
index 0000000..f772910
--- /dev/null
+++ b/tests/emails/legacy/023.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 804 17) ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/023.stalwart.0.2.0.bodystructure b/tests/emails/legacy/023.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..6be4563
--- /dev/null
+++ b/tests/emails/legacy/023.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16 "e4d418b6e9f4dbd62809b74b811246a7" NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("attachment" ("filename" "blueball.png")) NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 804 17 "e958f6a730a13bc65b70fc70540c5741" ("attachment" ("filename" "farmerandstork.txt")) NIL NIL) ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16 "e4d418b6e9f4dbd62809b74b811246a7" ("attachment" ("filename" "HasenundFr�sche.txt")) NIL NIL) "mixed" ("boundary" "=====================_716541962==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/024.stalwart.0.2.0.body b/tests/emails/legacy/024.stalwart.0.2.0.body
new file mode 100644
index 0000000..3c375aa
--- /dev/null
+++ b/tests/emails/legacy/024.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1239 27) ("image" "png" ("name" "2aa48eb6.png") "<4.2.0.58.20000519003735.00a8d7e0@pop.example.com.2>" NIL "base64" 1814) ("image" "png" ("name" "2aa48ec0.png") "<4.2.0.58.20000519003735.00a8d7e0@pop.example.com.3>" NIL "base64" 1990) "related"))
\ No newline at end of file
diff --git a/tests/emails/legacy/024.stalwart.0.2.0.bodystructure b/tests/emails/legacy/024.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..8a8be77
--- /dev/null
+++ b/tests/emails/legacy/024.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1239 27 "353effd469ba5d3b5a1de9ee4f20f658" NIL NIL NIL) ("image" "png" ("name" "2aa48eb6.png") "<4.2.0.58.20000519003735.00a8d7e0@pop.example.com.2>" NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("inline" ("filename" "2aa48eb6.png")) NIL NIL) ("image" "png" ("name" "2aa48ec0.png") "<4.2.0.58.20000519003735.00a8d7e0@pop.example.com.3>" NIL "base64" 1990 "1577b0b5cc127cbdb47c68349709b939" ("inline" ("filename" "2aa48ec0.png")) NIL NIL) "related" ("type" "text/html" "boundary" "=====================_715429112==_.REL") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/025.stalwart.0.2.0.body b/tests/emails/legacy/025.stalwart.0.2.0.body
new file mode 100644
index 0000000..6b511b8
--- /dev/null
+++ b/tests/emails/legacy/025.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1230 26) ("image" "png" ("name" "2aa51367.png") "<4.2.0.58.20000519003809.00a85140@pop.example.com.2>" NIL "base64" 1814) ("image" "png" ("name" "2aa51371.png") "<4.2.0.58.20000519003809.00a85140@pop.example.com.3>" NIL "base64" 1990) "related") ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1776) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/025.stalwart.0.2.0.bodystructure b/tests/emails/legacy/025.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..3b69e0d
--- /dev/null
+++ b/tests/emails/legacy/025.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1230 26 "0c3e5fc05601501037a613d4c6d470f0" NIL NIL NIL) ("image" "png" ("name" "2aa51367.png") "<4.2.0.58.20000519003809.00a85140@pop.example.com.2>" NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("inline" ("filename" "2aa51367.png")) NIL NIL) ("image" "png" ("name" "2aa51371.png") "<4.2.0.58.20000519003809.00a85140@pop.example.com.3>" NIL "base64" 1990 "1577b0b5cc127cbdb47c68349709b939" ("inline" ("filename" "2aa51371.png")) NIL NIL) "related" ("type" "text/html" "boundary" "=====================_715462801==_.REL") NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("attachment" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1776 "a7bd1ed2cd36d0576a0d6b69e998e37b" ("attachment" ("filename" "greenball.png")) NIL NIL) "mixed" ("boundary" "=====================_715462801==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/026.stalwart.0.2.0.body b/tests/emails/legacy/026.stalwart.0.2.0.body
new file mode 100644
index 0000000..9f9be4d
--- /dev/null
+++ b/tests/emails/legacy/026.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16) ("text" "plain" ("name" "HasenundFr�sche.txt" "x-mac-type" "54455854" "x-mac-creator" "74747874") NIL NIL "x-uuencode" 1088 21) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 804 17) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/026.stalwart.0.2.0.bodystructure b/tests/emails/legacy/026.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..38ba1c2
--- /dev/null
+++ b/tests/emails/legacy/026.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 16 "e4d418b6e9f4dbd62809b74b811246a7" NIL NIL NIL) ("text" "plain" ("name" "HasenundFr�sche.txt" "x-mac-type" "54455854" "x-mac-creator" "74747874") NIL NIL "x-uuencode" 1088 21 "ee9518c5df1ef0df01a4621bd93909ac" ("attachment" ("filename" "HasenundFr�sche.txt")) NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 804 17 "e958f6a730a13bc65b70fc70540c5741" ("attachment" ("filename" "farmerandstork.txt")) NIL NIL) "mixed" ("boundary" "=====================_716740438==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/027.stalwart.0.2.0.body b/tests/emails/legacy/027.stalwart.0.2.0.body
new file mode 100644
index 0000000..0da3296
--- /dev/null
+++ b/tests/emails/legacy/027.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 811 17))
\ No newline at end of file
diff --git a/tests/emails/legacy/027.stalwart.0.2.0.bodystructure b/tests/emails/legacy/027.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..e94c919
--- /dev/null
+++ b/tests/emails/legacy/027.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 811 17 "9697f984a3e63af99de12bc7e2493be3" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/028.stalwart.0.2.0.body b/tests/emails/legacy/028.stalwart.0.2.0.body
new file mode 100644
index 0000000..45f264d
--- /dev/null
+++ b/tests/emails/legacy/028.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 20) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1576 36) "alternative") ("image" "png" ("name" "blueball.png") "<823504223@17052000-0f8d>" NIL "base64" 1816) ("image" "png" ("name" "redball.png") "<823504223@17052000-0f94>" NIL "base64" 1992) "related"))
\ No newline at end of file
diff --git a/tests/emails/legacy/028.stalwart.0.2.0.bodystructure b/tests/emails/legacy/028.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..00f9fe6
--- /dev/null
+++ b/tests/emails/legacy/028.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 809 20 "50ee3814d16cac48941c85bcd017d5c1" NIL NIL NIL) ("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1576 36 "ff968407256a75bb533f7acabec91f35" NIL NIL NIL) "alternative" ("boundary" "----=_NextPart_001_000D_01BFC038.5A5C8E60") NIL NIL NIL) ("image" "png" ("name" "blueball.png") "<823504223@17052000-0f8d>" NIL "base64" 1816 "3cda6111307ed1b70869902a649fc627" NIL NIL NIL) ("image" "png" ("name" "redball.png") "<823504223@17052000-0f94>" NIL "base64" 1992 "9ab8d3f2919159b36196a9addb0595f9" NIL NIL NIL) "related" ("boundary" "----=_NextPart_000_000C_01BFC038.5A5C8E60") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/029.stalwart.0.2.0.body b/tests/emails/legacy/029.stalwart.0.2.0.body
new file mode 100644
index 0000000..28596c9
--- /dev/null
+++ b/tests/emails/legacy/029.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 771 16))
\ No newline at end of file
diff --git a/tests/emails/legacy/029.stalwart.0.2.0.bodystructure b/tests/emails/legacy/029.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..30ac79c
--- /dev/null
+++ b/tests/emails/legacy/029.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 771 16 "eaad4ba6e33253304a00d6e051087364" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/030.stalwart.0.2.0.body b/tests/emails/legacy/030.stalwart.0.2.0.body
new file mode 100644
index 0000000..f7025eb
--- /dev/null
+++ b/tests/emails/legacy/030.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780) ("text" "plain" ("charset" "us-ascii" "name" "hareandtoroise.txt") NIL NIL "7bit" 762 6) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/030.stalwart.0.2.0.bodystructure b/tests/emails/legacy/030.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..a29926a
--- /dev/null
+++ b/tests/emails/legacy/030.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14 "3c8e7aa45d6a059f9d10966b734ee266" NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780 "55dd3e55d147bf1a722b462a8e5dbb50" ("inline" ("filename" "greenball.png")) NIL NIL) ("text" "plain" ("charset" "us-ascii" "name" "hareandtoroise.txt") NIL NIL "7bit" 762 6 "b8f11127a137a5fa0f0892bb0e5aea3e" ("inline" ("filename" "hareandtoroise.txt")) NIL NIL) "mixed" ("boundary" "------------0BBC657DDC74A0B8454627FD") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/031.stalwart.0.2.0.body b/tests/emails/legacy/031.stalwart.0.2.0.body
new file mode 100644
index 0000000..33b822f
--- /dev/null
+++ b/tests/emails/legacy/031.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 41 2) ("application" "octet-stream" ("name" "redball.png") "<Pine.LNX.4.21.0005190955480.8452@penguin.example.com>" "A PNG graphic file" "BASE64" 2004) ("application" "octet-stream" ("name" "blueball.png") "<Pine.LNX.4.21.0005190955481.8452@penguin.example.com>" "A PNG graphic file" "BASE64" 1826) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/031.stalwart.0.2.0.bodystructure b/tests/emails/legacy/031.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..9cd43ee
--- /dev/null
+++ b/tests/emails/legacy/031.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 41 2 "5daf991289ab39d559233bff581f9954" NIL NIL NIL) ("application" "octet-stream" ("name" "redball.png") "<Pine.LNX.4.21.0005190955480.8452@penguin.example.com>" "A PNG graphic file" "BASE64" 2004 "7fe6e826c090afa5f600e706bf947c2b" ("attachment" ("filename" "redball.png")) NIL NIL) ("application" "octet-stream" ("name" "blueball.png") "<Pine.LNX.4.21.0005190955481.8452@penguin.example.com>" "A PNG graphic file" "BASE64" 1826 "fe4518dfc0f98d74b2a34ecf96f42ffc" ("attachment" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "-1463757054-952513540-958744548=:8452") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/032.stalwart.0.2.0.body b/tests/emails/legacy/032.stalwart.0.2.0.body
new file mode 100644
index 0000000..8ba811d
--- /dev/null
+++ b/tests/emails/legacy/032.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 798 21) ("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 949 17) "alternative") ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/032.stalwart.0.2.0.bodystructure b/tests/emails/legacy/032.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..266a938
--- /dev/null
+++ b/tests/emails/legacy/032.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 798 21 "690e2ce94f3cc30b6db96299b0cdf1d6" NIL NIL NIL) ("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 949 17 "f9e75f185662ddcc2c68e811f8dde51b" NIL NIL NIL) "alternative" ("boundary" "------------D74AE2393FB01D1B284AE257") NIL NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780 "55dd3e55d147bf1a722b462a8e5dbb50" ("inline" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "------------C78F594988075E36AE03C243") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/033.stalwart.0.2.0.body b/tests/emails/legacy/033.stalwart.0.2.0.body
new file mode 100644
index 0000000..1635c99
--- /dev/null
+++ b/tests/emails/legacy/033.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "UTF-8") NIL NIL "quoted-printable" 804 22))
\ No newline at end of file
diff --git a/tests/emails/legacy/033.stalwart.0.2.0.bodystructure b/tests/emails/legacy/033.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..14a08a3
--- /dev/null
+++ b/tests/emails/legacy/033.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "UTF-8") NIL NIL "quoted-printable" 804 22 "f4c0a52222a11243cfe25effc945edfb" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/034.stalwart.0.2.0.body b/tests/emails/legacy/034.stalwart.0.2.0.body
new file mode 100644
index 0000000..f2ca9c8
--- /dev/null
+++ b/tests/emails/legacy/034.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "UTF-7") NIL NIL "7bit" 791 16))
\ No newline at end of file
diff --git a/tests/emails/legacy/034.stalwart.0.2.0.bodystructure b/tests/emails/legacy/034.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c43b291
--- /dev/null
+++ b/tests/emails/legacy/034.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "UTF-7") NIL NIL "7bit" 791 16 "854d8c9e1400de9eaa145ced26ca3559" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/035.stalwart.0.2.0.body b/tests/emails/legacy/035.stalwart.0.2.0.body
new file mode 100644
index 0000000..e39a5a4
--- /dev/null
+++ b/tests/emails/legacy/035.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 824 25) (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 1122 19) ("image" "png" NIL "<part1.39235FC5.E71D8178@example.com>" NIL "base64" 1816) ("image" "png" NIL "<part2.39235FC5.E71D8178@example.com>" NIL "base64" 1992) "related") "alternative") ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/035.stalwart.0.2.0.bodystructure b/tests/emails/legacy/035.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..0a7a9f0
--- /dev/null
+++ b/tests/emails/legacy/035.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 824 25 "e3b90092676e82ec521994dc2aebcd3d" NIL NIL NIL) (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 1122 19 "cdb445bb9c8cd71cb0952b666cadbc02" NIL NIL NIL) ("image" "png" NIL "<part1.39235FC5.E71D8178@example.com>" NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "C:TEMPnsmailEG.png")) NIL NIL) ("image" "png" NIL "<part2.39235FC5.E71D8178@example.com>" NIL "base64" 1992 "65b8ca765ae9b0d288ffc632d72e14cb" ("inline" ("filename" "C:TEMPnsmail39.png")) NIL NIL) "related" ("boundary" "------------C02FA3D0A04E95F295FB25EB") NIL NIL NIL) "alternative" ("boundary" "------------F03F94BA73D3B9E8C1B94D92") NIL NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992 "65b8ca765ae9b0d288ffc632d72e14cb" ("inline" ("filename" "redball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780 "55dd3e55d147bf1a722b462a8e5dbb50" ("inline" ("filename" "greenball.png")) NIL NIL) "mixed" ("boundary" "------------A1E83A41894D3755390B838A") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/036.stalwart.0.2.0.body b/tests/emails/legacy/036.stalwart.0.2.0.body
new file mode 100644
index 0000000..3e5a6c7
--- /dev/null
+++ b/tests/emails/legacy/036.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 813 18))
\ No newline at end of file
diff --git a/tests/emails/legacy/036.stalwart.0.2.0.bodystructure b/tests/emails/legacy/036.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..bb90072
--- /dev/null
+++ b/tests/emails/legacy/036.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 813 18 "3b3d4937ea89d5661a56edbcb749c3bf" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/037.stalwart.0.2.0.body b/tests/emails/legacy/037.stalwart.0.2.0.body
new file mode 100644
index 0000000..4f14df1
--- /dev/null
+++ b/tests/emails/legacy/037.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/037.stalwart.0.2.0.bodystructure b/tests/emails/legacy/037.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..1d24192
--- /dev/null
+++ b/tests/emails/legacy/037.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "7215ee9c7d9dc229d2921a40e899ec5f" NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "------------E7889DDF0F75D34163841C59") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/038.stalwart.0.2.0.body b/tests/emails/legacy/038.stalwart.0.2.0.body
new file mode 100644
index 0000000..62e836c
--- /dev/null
+++ b/tests/emails/legacy/038.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 762 7))
\ No newline at end of file
diff --git a/tests/emails/legacy/038.stalwart.0.2.0.bodystructure b/tests/emails/legacy/038.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..5154466
--- /dev/null
+++ b/tests/emails/legacy/038.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 762 7 "338c847af6d7850d305176d63b34429b" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/039.stalwart.0.2.0.body b/tests/emails/legacy/039.stalwart.0.2.0.body
new file mode 100644
index 0000000..93589c8
--- /dev/null
+++ b/tests/emails/legacy/039.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 1134 17) ("image" "png" NIL "<part1.39236103.1B697A54@example.com>" NIL "base64" 1816) ("image" "png" NIL "<part2.39236103.1B697A54@example.com>" NIL "base64" 1992) "related") ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/039.stalwart.0.2.0.bodystructure b/tests/emails/legacy/039.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..4d4358c
--- /dev/null
+++ b/tests/emails/legacy/039.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 1134 17 "7f3a699dc8fdf9f6e895c474920d7cbd" NIL NIL NIL) ("image" "png" NIL "<part1.39236103.1B697A54@example.com>" NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "C:TEMPnsmailV0.png")) NIL NIL) ("image" "png" NIL "<part2.39236103.1B697A54@example.com>" NIL "base64" 1992 "65b8ca765ae9b0d288ffc632d72e14cb" ("inline" ("filename" "C:TEMPnsmailNM.png")) NIL NIL) "related" ("boundary" "------------8E6A06810565BCAB5E1F7D97") NIL NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780 "55dd3e55d147bf1a722b462a8e5dbb50" ("inline" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "------------B7133A01A6B323BF00DBC9A7") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/040.stalwart.0.2.0.body b/tests/emails/legacy/040.stalwart.0.2.0.body
new file mode 100644
index 0000000..9fc090b
--- /dev/null
+++ b/tests/emails/legacy/040.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 808 18))
\ No newline at end of file
diff --git a/tests/emails/legacy/040.stalwart.0.2.0.bodystructure b/tests/emails/legacy/040.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..4df101c
--- /dev/null
+++ b/tests/emails/legacy/040.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 808 18 "98ab8c7d00ee4902d1bb1edb596d45fd" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/041.stalwart.0.2.0.body b/tests/emails/legacy/041.stalwart.0.2.0.body
new file mode 100644
index 0000000..9b56385
--- /dev/null
+++ b/tests/emails/legacy/041.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 0 0) ("application" "octet-stream" ("name" "redball.png") "<Pine.LNX.4.21.0005191023160.8452@penguin.example.com>" "red ball" "BASE64" 2004) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/041.stalwart.0.2.0.bodystructure b/tests/emails/legacy/041.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..fd9a54f
--- /dev/null
+++ b/tests/emails/legacy/041.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) ("application" "octet-stream" ("name" "redball.png") "<Pine.LNX.4.21.0005191023160.8452@penguin.example.com>" "red ball" "BASE64" 2004 "7fe6e826c090afa5f600e706bf947c2b" ("attachment" ("filename" "redball.png")) NIL NIL) "mixed" ("boundary" "-1463757054-170444605-958746196=:8452") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/042.stalwart.0.2.0.body b/tests/emails/legacy/042.stalwart.0.2.0.body
new file mode 100644
index 0000000..a6b3124
--- /dev/null
+++ b/tests/emails/legacy/042.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14) ("text" "plain" ("charset" "us-ascii" "name" "farmerandstork.txt") NIL NIL "7bit" 804 17) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/042.stalwart.0.2.0.bodystructure b/tests/emails/legacy/042.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..47752a3
--- /dev/null
+++ b/tests/emails/legacy/042.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14 "3c8e7aa45d6a059f9d10966b734ee266" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii" "name" "farmerandstork.txt") NIL NIL "7bit" 804 17 "e958f6a730a13bc65b70fc70540c5741" ("inline" ("filename" "farmerandstork.txt")) NIL NIL) "mixed" ("boundary" "------------77060D866A66DC8D0921E051") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/043.stalwart.0.2.0.body b/tests/emails/legacy/043.stalwart.0.2.0.body
new file mode 100644
index 0000000..d951a0a
--- /dev/null
+++ b/tests/emails/legacy/043.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 798 21) ("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 949 17) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/legacy/043.stalwart.0.2.0.bodystructure b/tests/emails/legacy/043.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c7f0509
--- /dev/null
+++ b/tests/emails/legacy/043.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 798 21 "690e2ce94f3cc30b6db96299b0cdf1d6" NIL NIL NIL) ("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 949 17 "f9e75f185662ddcc2c68e811f8dde51b" NIL NIL NIL) "alternative" ("boundary" "------------9D454F23DA86BCD63FA3805F") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/044.stalwart.0.2.0.body b/tests/emails/legacy/044.stalwart.0.2.0.body
new file mode 100644
index 0000000..c33455c
--- /dev/null
+++ b/tests/emails/legacy/044.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 798 21) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/044.stalwart.0.2.0.bodystructure b/tests/emails/legacy/044.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..0b5d04f
--- /dev/null
+++ b/tests/emails/legacy/044.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 798 21 "690e2ce94f3cc30b6db96299b0cdf1d6" NIL NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "base64" 1992 "65b8ca765ae9b0d288ffc632d72e14cb" ("inline" ("filename" "redball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1780 "55dd3e55d147bf1a722b462a8e5dbb50" ("inline" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1816 "a74467a5fe49c14c6bb48ab4ad7a5d2f" ("inline" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "------------A1FCDEE154E03D875E5D6779") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/045.stalwart.0.2.0.body b/tests/emails/legacy/045.stalwart.0.2.0.body
new file mode 100644
index 0000000..f72c9fa
--- /dev/null
+++ b/tests/emails/legacy/045.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 0 0) ("text" "plain" ("charset" "iso-8859-1" "name" "HasenundFrösche.txt") "<Pine.LNX.4.21.0005191026120.8452@penguin.example.com>" "Short story in German" "BASE64" 1040 16) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/045.stalwart.0.2.0.bodystructure b/tests/emails/legacy/045.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..fd71f4c
--- /dev/null
+++ b/tests/emails/legacy/045.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) ("text" "plain" ("charset" "iso-8859-1" "name" "HasenundFrösche.txt") "<Pine.LNX.4.21.0005191026120.8452@penguin.example.com>" "Short story in German" "BASE64" 1040 16 "717936ad5f7a6db66edbf19617cc324f" ("attachment" ("filename" "HasenundFrösche.txt")) NIL NIL) "mixed" ("boundary" "-1463757054-891160829-958746372=:8452") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/046.stalwart.0.2.0.body b/tests/emails/legacy/046.stalwart.0.2.0.body
new file mode 100644
index 0000000..10cd9db
--- /dev/null
+++ b/tests/emails/legacy/046.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 800 22))
\ No newline at end of file
diff --git a/tests/emails/legacy/046.stalwart.0.2.0.bodystructure b/tests/emails/legacy/046.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c004816
--- /dev/null
+++ b/tests/emails/legacy/046.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 800 22 "b352c4a3bb3b802d0c06fd7a02b26e42" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/047.stalwart.0.2.0.body b/tests/emails/legacy/047.stalwart.0.2.0.body
new file mode 100644
index 0000000..c44dcb9
--- /dev/null
+++ b/tests/emails/legacy/047.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14) ("text" "plain" ("charset" "iso-8859-1" "name" "HasenundFrösche.txt") NIL NIL "quoted-printable" 812 19) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/047.stalwart.0.2.0.bodystructure b/tests/emails/legacy/047.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..0a212c2
--- /dev/null
+++ b/tests/emails/legacy/047.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14 "3c8e7aa45d6a059f9d10966b734ee266" NIL NIL NIL) ("text" "plain" ("charset" "iso-8859-1" "name" "HasenundFrösche.txt") NIL NIL "quoted-printable" 812 19 "acd7004134113bffdb8559159eb2335d" ("inline" ("filename" "HasenundFrösche.txt")) NIL NIL) "mixed" ("boundary" "------------CA611088711119FBDB3473B4") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/048.stalwart.0.2.0.body b/tests/emails/legacy/048.stalwart.0.2.0.body
new file mode 100644
index 0000000..dae3e6b
--- /dev/null
+++ b/tests/emails/legacy/048.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14) ("image" "png" ("name" "redball.png") NIL NIL "x-uuencode" 2067) ("image" "png" ("name" "greenball.png") NIL NIL "x-uuencode" 1849) ("image" "png" ("name" "blueball.png") NIL NIL "x-uuencode" 1887) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/048.stalwart.0.2.0.bodystructure b/tests/emails/legacy/048.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..bfd6c9c
--- /dev/null
+++ b/tests/emails/legacy/048.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 767 14 "3c8e7aa45d6a059f9d10966b734ee266" NIL NIL NIL) ("image" "png" ("name" "redball.png") NIL NIL "x-uuencode" 2067 "95b03c9c4149d1255af9bdf572739456" ("inline" ("filename" "redball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "x-uuencode" 1849 "ef13d1ff135f80f447c3b477c3b46883" ("inline" ("filename" "greenball.png")) NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "x-uuencode" 1887 "85a61198b7e57446cbe3280e5dfb5967" ("inline" ("filename" "blueball.png")) NIL NIL) "mixed" ("boundary" "------------177483472E7788F4AD46AB1A") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/049.stalwart.0.2.0.body b/tests/emails/legacy/049.stalwart.0.2.0.body
new file mode 100644
index 0000000..37efcfd
--- /dev/null
+++ b/tests/emails/legacy/049.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 6585 121))
\ No newline at end of file
diff --git a/tests/emails/legacy/049.stalwart.0.2.0.bodystructure b/tests/emails/legacy/049.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..a36e805
--- /dev/null
+++ b/tests/emails/legacy/049.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 6585 121 "e4a5e8270793943e13cd081cc076addb" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/050.stalwart.0.2.0.body b/tests/emails/legacy/050.stalwart.0.2.0.body
new file mode 100644
index 0000000..b6095fc
--- /dev/null
+++ b/tests/emails/legacy/050.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1239 27) ("image" "png" ("name" "2aa658b6.png") "<4.2.0.58.20000519003934.00a866f0@pop.example.com.2>" NIL "base64" 1814) ("image" "png" ("name" "2aa658c0.png") "<4.2.0.58.20000519003934.00a866f0@pop.example.com.3>" NIL "base64" 1990) "related"))
\ No newline at end of file
diff --git a/tests/emails/legacy/050.stalwart.0.2.0.bodystructure b/tests/emails/legacy/050.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..fd5f517
--- /dev/null
+++ b/tests/emails/legacy/050.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "html" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 1239 27 "b92dca370af0a1fd4aac9f08b4a8dc02" NIL NIL NIL) ("image" "png" ("name" "2aa658b6.png") "<4.2.0.58.20000519003934.00a866f0@pop.example.com.2>" NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("inline" ("filename" "2aa658b6.png")) NIL NIL) ("image" "png" ("name" "2aa658c0.png") "<4.2.0.58.20000519003934.00a866f0@pop.example.com.3>" NIL "base64" 1990 "1577b0b5cc127cbdb47c68349709b939" ("inline" ("filename" "2aa658c0.png")) NIL NIL) "related" ("type" "text/html" "boundary" "=====================_715546120==_.REL") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/051.stalwart.0.2.0.body b/tests/emails/legacy/051.stalwart.0.2.0.body
new file mode 100644
index 0000000..44bd1fc
--- /dev/null
+++ b/tests/emails/legacy/051.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 833 16) ("image" "png" ("name" "2aa5e03a.png") "<4.2.0.58.20000519003903.00a859b0@pop.example.com.2>" NIL "base64" 1814) ("image" "png" ("name" "2aa5e044.png") "<4.2.0.58.20000519003903.00a859b0@pop.example.com.3>" NIL "base64" 1990) "related") ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1776) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/legacy/051.stalwart.0.2.0.bodystructure b/tests/emails/legacy/051.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..e03a2ca
--- /dev/null
+++ b/tests/emails/legacy/051.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "iso-8859-1") NIL NIL "quoted-printable" 833 16 "c1c7f82fcd6c8421b947832ff77180fa" NIL NIL NIL) ("image" "png" ("name" "2aa5e03a.png") "<4.2.0.58.20000519003903.00a859b0@pop.example.com.2>" NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("inline" ("filename" "2aa5e03a.png")) NIL NIL) ("image" "png" ("name" "2aa5e044.png") "<4.2.0.58.20000519003903.00a859b0@pop.example.com.3>" NIL "base64" 1990 "1577b0b5cc127cbdb47c68349709b939" ("inline" ("filename" "2aa5e044.png")) NIL NIL) "related" ("type" "text/plain" "boundary" "=====================_715515186==_.REL") NIL NIL NIL) ("image" "png" ("name" "blueball.png") NIL NIL "base64" 1814 "d4326c23ab037f97d1839deaeeb9df22" ("attachment" ("filename" "blueball.png")) NIL NIL) ("image" "png" ("name" "greenball.png") NIL NIL "base64" 1776 "a7bd1ed2cd36d0576a0d6b69e998e37b" ("attachment" ("filename" "greenball.png")) NIL NIL) "mixed" ("boundary" "=====================_715515186==_") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/052.stalwart.0.2.0.body b/tests/emails/legacy/052.stalwart.0.2.0.body
new file mode 100644
index 0000000..1113cb1
--- /dev/null
+++ b/tests/emails/legacy/052.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 754 17))
\ No newline at end of file
diff --git a/tests/emails/legacy/052.stalwart.0.2.0.bodystructure b/tests/emails/legacy/052.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..f2bbf8a
--- /dev/null
+++ b/tests/emails/legacy/052.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 754 17 "7128e53dcbc2adef2a72a31d9ec16435" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/legacy/053.stalwart.0.2.0.body b/tests/emails/legacy/053.stalwart.0.2.0.body
new file mode 100644
index 0000000..337a7e2
--- /dev/null
+++ b/tests/emails/legacy/053.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "utf-8") NIL NIL "quoted-printable" 863 18))
\ No newline at end of file
diff --git a/tests/emails/legacy/053.stalwart.0.2.0.bodystructure b/tests/emails/legacy/053.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..99b17fa
--- /dev/null
+++ b/tests/emails/legacy/053.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "utf-8") NIL NIL "quoted-printable" 863 18 "ad92298b60df76c272ae7dbad85fc36c" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/000.stalwart.0.2.0.body b/tests/emails/malformed/000.stalwart.0.2.0.body
new file mode 100644
index 0000000..412b0db
--- /dev/null
+++ b/tests/emails/malformed/000.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 0 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/000.stalwart.0.2.0.bodystructure b/tests/emails/malformed/000.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c0238aa
--- /dev/null
+++ b/tests/emails/malformed/000.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) "mixed" ("boundary" ":foo") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/001.stalwart.0.2.0.body b/tests/emails/malformed/001.stalwart.0.2.0.body
new file mode 100644
index 0000000..e2bec6c
--- /dev/null
+++ b/tests/emails/malformed/001.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2 1) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/001.stalwart.0.2.0.bodystructure b/tests/emails/malformed/001.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..33503f3
--- /dev/null
+++ b/tests/emails/malformed/001.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2 1 "81051bcc2cf1bedf378224b0a93e2877" NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL) "mixed" ("boundary" "ab") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/002.stalwart.0.2.0.body b/tests/emails/malformed/002.stalwart.0.2.0.body
new file mode 100644
index 0000000..3506798
--- /dev/null
+++ b/tests/emails/malformed/002.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "mixed" ("boundary" "ab") NIL NIL "7bit" 8 2))
\ No newline at end of file
diff --git a/tests/emails/malformed/002.stalwart.0.2.0.bodystructure b/tests/emails/malformed/002.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c6f94c1
--- /dev/null
+++ b/tests/emails/malformed/002.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "mixed" ("boundary" "ab") NIL NIL "7bit" 8 2 "675cae73ebd3620b12d62317598e2385" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/003.stalwart.0.2.0.body b/tests/emails/malformed/003.stalwart.0.2.0.body
new file mode 100644
index 0000000..c353e21
--- /dev/null
+++ b/tests/emails/malformed/003.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/003.stalwart.0.2.0.bodystructure b/tests/emails/malformed/003.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..2c4f78a
--- /dev/null
+++ b/tests/emails/malformed/003.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2 "675cae73ebd3620b12d62317598e2385" NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/004.stalwart.0.2.0.body b/tests/emails/malformed/004.stalwart.0.2.0.body
new file mode 100644
index 0000000..c353e21
--- /dev/null
+++ b/tests/emails/malformed/004.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/004.stalwart.0.2.0.bodystructure b/tests/emails/malformed/004.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..2c4f78a
--- /dev/null
+++ b/tests/emails/malformed/004.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2 "675cae73ebd3620b12d62317598e2385" NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/005.stalwart.0.2.0.body b/tests/emails/malformed/005.stalwart.0.2.0.body
new file mode 100644
index 0000000..ee02b51
--- /dev/null
+++ b/tests/emails/malformed/005.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 4 0) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/005.stalwart.0.2.0.bodystructure b/tests/emails/malformed/005.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..36fe116
--- /dev/null
+++ b/tests/emails/malformed/005.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 4 0 "841a2d689ad86bd1611447453c22c6fc" NIL NIL NIL) "mixed" ("boundary" "a----") NIL NIL NIL) "mixed" ("boundary" "a--") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/006.stalwart.0.2.0.body b/tests/emails/malformed/006.stalwart.0.2.0.body
new file mode 100644
index 0000000..c353e21
--- /dev/null
+++ b/tests/emails/malformed/006.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/006.stalwart.0.2.0.bodystructure b/tests/emails/malformed/006.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..1d061ac
--- /dev/null
+++ b/tests/emails/malformed/006.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2 "675cae73ebd3620b12d62317598e2385" NIL NIL NIL) "mixed" ("boundary" "ab") NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/007.stalwart.0.2.0.body b/tests/emails/malformed/007.stalwart.0.2.0.body
new file mode 100644
index 0000000..12f8138
--- /dev/null
+++ b/tests/emails/malformed/007.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2 1) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/007.stalwart.0.2.0.bodystructure b/tests/emails/malformed/007.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..fae7385
--- /dev/null
+++ b/tests/emails/malformed/007.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2 1 "81051bcc2cf1bedf378224b0a93e2877" NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/008.stalwart.0.2.0.body b/tests/emails/malformed/008.stalwart.0.2.0.body
new file mode 100644
index 0000000..5cd5bfd
--- /dev/null
+++ b/tests/emails/malformed/008.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 4 0) ("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 9 2) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/008.stalwart.0.2.0.bodystructure b/tests/emails/malformed/008.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..fbde7b2
--- /dev/null
+++ b/tests/emails/malformed/008.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 4 0 "841a2d689ad86bd1611447453c22c6fc" NIL NIL NIL) ("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 9 2 "3230185921e44cbb6d527ff46e330c4e" NIL NIL NIL) "mixed" ("boundary" "a") NIL NIL NIL) "mixed" ("boundary" "ab") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/009.stalwart.0.2.0.body b/tests/emails/malformed/009.stalwart.0.2.0.body
new file mode 100644
index 0000000..e69de29
diff --git a/tests/emails/malformed/010.stalwart.0.2.0.body b/tests/emails/malformed/010.stalwart.0.2.0.body
new file mode 100644
index 0000000..8b2a17f
--- /dev/null
+++ b/tests/emails/malformed/010.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("message" "rfc822" NIL NIL NIL NIL 65 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 33 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 5 2) 0) 0))
\ No newline at end of file
diff --git a/tests/emails/malformed/010.stalwart.0.2.0.bodystructure b/tests/emails/malformed/010.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c0103db
--- /dev/null
+++ b/tests/emails/malformed/010.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("message" "rfc822" NIL NIL NIL NIL 65 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 33 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 5 2 "3ee4fd3682dd9dbdcafb6efb2f9da7af" NIL NIL NIL) 0 "23b4fe800321e776ba557e173d9e7204" NIL NIL NIL) 0 "81dbc020f5002fdab65df0c45ee25d14" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/011.stalwart.0.2.0.body b/tests/emails/malformed/011.stalwart.0.2.0.body
new file mode 100644
index 0000000..ba181af
--- /dev/null
+++ b/tests/emails/malformed/011.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 44 6) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/011.stalwart.0.2.0.bodystructure b/tests/emails/malformed/011.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..62e1b0d
--- /dev/null
+++ b/tests/emails/malformed/011.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "c4ca4238a0b923820dcc509a6f75849b" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 44 6 "5c8907e6c8912a832fda791d428b6e42" NIL NIL NIL) "mixed" ("boundary" "2") NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/012.stalwart.0.2.0.body b/tests/emails/malformed/012.stalwart.0.2.0.body
new file mode 100644
index 0000000..a9c121d
--- /dev/null
+++ b/tests/emails/malformed/012.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ((("message" "rfc822" NIL NIL NIL NIL 29 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) 0) ("message" "rfc822" NIL NIL NIL NIL 104 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 76 8) 0) "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/012.stalwart.0.2.0.bodystructure b/tests/emails/malformed/012.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..28062f8
--- /dev/null
+++ b/tests/emails/malformed/012.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("message" "rfc822" NIL NIL NIL NIL 29 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "c4ca4238a0b923820dcc509a6f75849b" NIL NIL NIL) 0 "11ce2245e7895910cbbbda46df772a5c" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 104 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 76 8 "574bd82e1dc61370f545774f2b3c482a" NIL NIL NIL) 0 "83d6de80af2e1b2154585d33da97d6be" NIL NIL NIL) "mixed" ("boundary" "2") NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/013.stalwart.0.2.0.body b/tests/emails/malformed/013.stalwart.0.2.0.body
new file mode 100644
index 0000000..9d107e4
--- /dev/null
+++ b/tests/emails/malformed/013.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0) (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0) (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0) (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0) "mixed") "mixed") "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/013.stalwart.0.2.0.bodystructure b/tests/emails/malformed/013.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..8c85140
--- /dev/null
+++ b/tests/emails/malformed/013.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0 "e4d7f1b4ed2e42d15898f4b27b019da4" NIL NIL NIL) (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0 "e4d7f1b4ed2e42d15898f4b27b019da4" NIL NIL NIL) (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0 "e4d7f1b4ed2e42d15898f4b27b019da4" NIL NIL NIL) (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0 "e4d7f1b4ed2e42d15898f4b27b019da4" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/014.stalwart.0.2.0.body b/tests/emails/malformed/014.stalwart.0.2.0.body
new file mode 100644
index 0000000..ec22a29
--- /dev/null
+++ b/tests/emails/malformed/014.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/014.stalwart.0.2.0.bodystructure b/tests/emails/malformed/014.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..c138f53
--- /dev/null
+++ b/tests/emails/malformed/014.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0 "e4d7f1b4ed2e42d15898f4b27b019da4" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 0 0 "d41d8cd98f00b204e9800998ecf8427e" NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/015.stalwart.0.2.0.body b/tests/emails/malformed/015.stalwart.0.2.0.body
new file mode 100644
index 0000000..581b5f6
--- /dev/null
+++ b/tests/emails/malformed/015.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "quoted-printable" 35 2) ("application" "pgp-signature" ("name" "signature.asc") NIL NIL NIL 9) "signed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/015.stalwart.0.2.0.bodystructure b/tests/emails/malformed/015.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..af6fea4
--- /dev/null
+++ b/tests/emails/malformed/015.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "quoted-printable" 35 2 "900d974c56a0239f94cae2992a575b06" NIL NIL NIL) ("application" "pgp-signature" ("name" "signature.asc") NIL NIL NIL 9 "26043330a1b34f460e93dc28a6c8bcec" NIL NIL NIL) "signed" ("micalg" "pgp-sha1" "protocol" "application/pgp-signature" "boundary" "=-GNQXLhuj24Pl1aCkk4/d") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/malformed/016.stalwart.0.2.0.body b/tests/emails/malformed/016.stalwart.0.2.0.body
new file mode 100644
index 0000000..6ce6e7e
--- /dev/null
+++ b/tests/emails/malformed/016.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 3 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2) "mixed") "mixed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/malformed/016.stalwart.0.2.0.bodystructure b/tests/emails/malformed/016.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..6209d21
--- /dev/null
+++ b/tests/emails/malformed/016.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "c4ca4238a0b923820dcc509a6f75849b" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 2 0 "b6d767d2f8ed5d21a44b0e5886680cb9" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 3 0 "310dcbbf4cce62f762a2aaa148d556bd" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 8 2 "0c20874303847a4741ac90976fa1f774" NIL NIL NIL) "mixed" ("boundary" "12345678901234567890123456789012345678901234567890123456789012345678901234567890") NIL NIL NIL) "mixed" ("boundary" "123456789012345678901234567890123456789012345678901234567890123456789012345678901") NIL NIL NIL) "mixed" ("boundary" "1234567890123456789012345678901234567890123456789012345678901234567890123456789012") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/000.stalwart.0.2.0.body b/tests/emails/rfc/000.stalwart.0.2.0.body
new file mode 100644
index 0000000..09fd2dd
--- /dev/null
+++ b/tests/emails/rfc/000.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 269 7) ("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 114 3) (("text" "basic" ("charset" "us-ascii") NIL NIL "base64" 87 2) ("text" "jpeg" ("charset" "us-ascii") NIL NIL "base64" 45 1) "parallel") ("text" "enriched" ("charset" "us-ascii") NIL NIL "7bit" 145 5) ("message" "rfc822" NIL NIL NIL NIL 230 (NIL "(subject in US-ASCII)" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "ISO-8859-1") NIL NIL "Quoted-printable" 49 1) 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/rfc/000.stalwart.0.2.0.bodystructure b/tests/emails/rfc/000.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..58e204a
--- /dev/null
+++ b/tests/emails/rfc/000.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 269 7 "bfff4642426d824a850af5a442be2e05" NIL NIL NIL) ("text" "plain" ("charset" "US-ASCII") NIL NIL "7bit" 114 3 "f5bdc157890d282c4c4e5c0573c12fa8" NIL NIL NIL) (("text" "basic" ("charset" "us-ascii") NIL NIL "base64" 87 2 "847b6ab9ad45d668a2202f08ecf8d7e6" NIL NIL NIL) ("text" "jpeg" ("charset" "us-ascii") NIL NIL "base64" 45 1 "4768a2c6a54172fb48f83a31441ff031" NIL NIL NIL) "parallel" ("boundary" "unique-boundary-2") NIL NIL NIL) ("text" "enriched" ("charset" "us-ascii") NIL NIL "7bit" 145 5 "357d38feff9c776055ee96f591888ce0" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 230 (NIL "(subject in US-ASCII)" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "ISO-8859-1") NIL NIL "Quoted-printable" 49 1 "50b4c7e680916f11ea11fd7f241991bd" NIL NIL NIL) 0 "c3ae3836536aef758fd6879e3259d0bd" NIL NIL NIL) "mixed" ("boundary" "unique-boundary-1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/001.stalwart.0.2.0.body b/tests/emails/rfc/001.stalwart.0.2.0.body
new file mode 100644
index 0000000..a16ddea
--- /dev/null
+++ b/tests/emails/rfc/001.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("message" "external-body" ("name" "BodyFormats.ps" "site" "thumper.bellcore.com" "mode" "image" "access-type" "ANON-FTP" "directory" "pub" "expiration" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL NIL 81) ("message" "external-body" ("access-type" "local-file" "name" "/u/nsb/writing/rfcs/RFC-MIME.ps" "site" "thumper.bellcore.com" "expiration" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL NIL 81) ("message" "external-body" ("access-type" "mail-server" "server" "listserv@bogus.bitnet" "expiration" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL NIL 101) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/rfc/001.stalwart.0.2.0.bodystructure b/tests/emails/rfc/001.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..f187c73
--- /dev/null
+++ b/tests/emails/rfc/001.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("message" "external-body" ("name" "BodyFormats.ps" "site" "thumper.bellcore.com" "mode" "image" "access-type" "ANON-FTP" "directory" "pub" "expiration" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL NIL 81 "ecd25c334350c9dcffb8b64c3a91651b" NIL NIL NIL) ("message" "external-body" ("access-type" "local-file" "name" "/u/nsb/writing/rfcs/RFC-MIME.ps" "site" "thumper.bellcore.com" "expiration" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL NIL 81 "ecd25c334350c9dcffb8b64c3a91651b" NIL NIL NIL) ("message" "external-body" ("access-type" "mail-server" "server" "listserv@bogus.bitnet" "expiration" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL NIL 101 "e7953f4b2b01e835a389ffafae1145c1" NIL NIL NIL) "alternative" ("boundary" "42") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/002.stalwart.0.2.0.body b/tests/emails/rfc/002.stalwart.0.2.0.body
new file mode 100644
index 0000000..5ab3e65
--- /dev/null
+++ b/tests/emails/rfc/002.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 66 5) ("message" "rfc822" NIL NIL NIL "7bit" 2026 ("Thu, 13 Aug 1998 07:42:41 +0000" "Map of Argentina with Description" (("Bill Clinton" NIL "president" "whitehouse.gov")) (("Bill Clinton" NIL "president" "whitehouse.gov")) (("Bill Clinton" NIL "president" "whitehouse.gov")) (("A1 Gore (The Enforcer)" NIL "vice-president" "whitehouse.gov")) NIL NIL NIL "<199804130742.RAA20366@mai1host.whitehouse.gov>") (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 367 12) ("image" "gif" ("name" "map_of_Argentina.gif") NIL NIL "base64" 394) "mixed") 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/rfc/002.stalwart.0.2.0.bodystructure b/tests/emails/rfc/002.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..6dfa237
--- /dev/null
+++ b/tests/emails/rfc/002.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 66 5 "eb977808d204187ec9cf22b26a16b4c9" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL "7bit" 2026 ("Thu, 13 Aug 1998 07:42:41 +0000" "Map of Argentina with Description" (("Bill Clinton" NIL "president" "whitehouse.gov")) (("Bill Clinton" NIL "president" "whitehouse.gov")) (("Bill Clinton" NIL "president" "whitehouse.gov")) (("A1 Gore (The Enforcer)" NIL "vice-president" "whitehouse.gov")) NIL NIL NIL "<199804130742.RAA20366@mai1host.whitehouse.gov>") (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 367 12 "131dc618f2cbb78156d126ce648b8812" NIL NIL NIL) ("image" "gif" ("name" "map_of_Argentina.gif") NIL NIL "base64" 394 "c33ac094d91c89a72a7187c4581a933e" ("inline" ("fi1ename" "map_of_Argentina.gif")) NIL NIL) "mixed" ("boundary" "DC8------------DC8638F443D87A7F0726DEF7") NIL NIL NIL) 0 "7978ff9d237474f0a76b9c0077a60140" ("inline" ()) NIL NIL) "mixed" ("boundary" "D7F------------D7FD5A0B8AB9C65CCDBFA872") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/003.stalwart.0.2.0.body b/tests/emails/rfc/003.stalwart.0.2.0.body
new file mode 100644
index 0000000..2075d72
--- /dev/null
+++ b/tests/emails/rfc/003.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 591 48))
\ No newline at end of file
diff --git a/tests/emails/rfc/003.stalwart.0.2.0.bodystructure b/tests/emails/rfc/003.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..09b7f54
--- /dev/null
+++ b/tests/emails/rfc/003.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 591 48 "b3accbd9ac814d0b9948a5874144ba9e" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/004.stalwart.0.2.0.body b/tests/emails/rfc/004.stalwart.0.2.0.body
new file mode 100644
index 0000000..b47fcc1
--- /dev/null
+++ b/tests/emails/rfc/004.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 46 1) (("message" NIL NIL NIL NIL NIL 105 ("Fri, 26 Mar 1993 09:13:32 +0000" "my opinion" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 23 1) 0) ("message" NIL NIL NIL NIL NIL 130 ("Fri, 26 Mar 1993 15:07:13 +0000" "my different opinion" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 32 1) 0) "digest") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/rfc/004.stalwart.0.2.0.bodystructure b/tests/emails/rfc/004.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..aeaffa4
--- /dev/null
+++ b/tests/emails/rfc/004.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 46 1 "a4412b9596b3dee3a8f12e6f9804d097" NIL NIL NIL) (("message" NIL NIL NIL NIL NIL 105 ("Fri, 26 Mar 1993 09:13:32 +0000" "my opinion" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 23 1 "1db9688388614270086f8fae44f32c0f" NIL NIL NIL) 0 "baff846f5f6d8b23c1dafd5aed9f50ff" NIL NIL NIL) ("message" NIL NIL NIL NIL NIL 130 ("Fri, 26 Mar 1993 15:07:13 +0000" "my different opinion" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 32 1 "1e9925625458fc3afd043c1801ae3a79" NIL NIL NIL) 0 "ed6a0c2bdeef0053d511a3de6420d0db" NIL NIL NIL) "digest" ("boundary" "---- next message ----") NIL NIL NIL) "mixed" ("boundary" "---- main boundary ----") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/005.stalwart.0.2.0.body b/tests/emails/rfc/005.stalwart.0.2.0.body
new file mode 100644
index 0000000..9f4c5c6
--- /dev/null
+++ b/tests/emails/rfc/005.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 80 1) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 78 2) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/rfc/005.stalwart.0.2.0.bodystructure b/tests/emails/rfc/005.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..8d0b74b
--- /dev/null
+++ b/tests/emails/rfc/005.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 80 1 "91d88e3100144c05a5caa6638f86b04d" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 78 2 "bc68c8a20bdd2ad30d4ce194d21acb1a" NIL NIL NIL) "mixed" ("boundary" "simple boundary") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/006.stalwart.0.2.0.body b/tests/emails/rfc/006.stalwart.0.2.0.body
new file mode 100644
index 0000000..34bef7b
--- /dev/null
+++ b/tests/emails/rfc/006.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "utf-8") NIL NIL "quoted-printable" 89 2) ("text" "html" ("charset" "utf-8") NIL NIL "quoted-printable" 95 2) "alternative"))
\ No newline at end of file
diff --git a/tests/emails/rfc/006.stalwart.0.2.0.bodystructure b/tests/emails/rfc/006.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..6ec1519
--- /dev/null
+++ b/tests/emails/rfc/006.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "utf-8") NIL NIL "quoted-printable" 89 2 "3c0b6296c1ecc18fe1829a078e7aadaf" ("inline" ()) NIL NIL) ("text" "html" ("charset" "utf-8") NIL NIL "quoted-printable" 95 2 "d7fefe2d2ba9897fb9ab66f53c98b294" ("inline" ()) NIL NIL) "alternative" ("boundary" "boundary-string") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/007.stalwart.0.2.0.body b/tests/emails/rfc/007.stalwart.0.2.0.body
new file mode 100644
index 0000000..ca28a6a
--- /dev/null
+++ b/tests/emails/rfc/007.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) (((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) ("image" "jpeg" NIL NIL NIL NIL 1) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) "mixed") (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 14 0) ("image" "jpeg" NIL NIL NIL NIL 1) "related") "alternative") ("image" "jpeg" NIL NIL NIL NIL 1) ("application" "x-excel" NIL NIL NIL NIL 1) ("message" "rfc822" NIL NIL NIL NIL 15 (NIL "J" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) 0) "mixed") ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/rfc/007.stalwart.0.2.0.bodystructure b/tests/emails/rfc/007.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..44ff555
--- /dev/null
+++ b/tests/emails/rfc/007.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "7fc56270e7a70fa81a5935b72eacbe29" ("inline" ()) NIL NIL) (((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "9d5ed678fe57bcca610140957afab571" ("inline" ()) NIL NIL) ("image" "jpeg" NIL NIL NIL NIL 1 "0d61f8370cad1d412f80b84d143e1257" ("inline" ()) NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "f623e75af30e62bbd73d6df5b50bb7b5" ("inline" ()) NIL NIL) "mixed" ("boundary" "4") NIL NIL NIL) (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 14 0 "ece7293a99c7e12f8d044b683e5c2f33" NIL NIL NIL) ("image" "jpeg" NIL NIL NIL NIL 1 "800618943025315f869e4e1f09471012" NIL NIL NIL) "related" ("boundary" "5") NIL NIL NIL) "alternative" ("boundary" "3") NIL NIL NIL) ("image" "jpeg" NIL NIL NIL NIL 1 "dfcf28d0734569a6a693bc8194de62bf" ("attachment" ()) NIL NIL) ("application" "x-excel" NIL NIL NIL NIL 1 "c1d9f50f86825a1a2302ec2449c17196" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 15 (NIL "J" NIL NIL NIL NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "ff44570aca8241914870afbc310cdb85" NIL NIL NIL) 0 "6009f918d1290d32284f2e7b7287ef4a" NIL NIL NIL) "mixed" ("boundary" "2") NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 1 0 "a5f3c6a11b03839d46af9fb43c97c188" ("inline" ()) NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/rfc/008.stalwart.0.2.0.body b/tests/emails/rfc/008.stalwart.0.2.0.body
new file mode 100644
index 0000000..c3a4ea4
--- /dev/null
+++ b/tests/emails/rfc/008.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "utf-8") NIL NIL "7bit" 54 0) ("message" "rfc822" NIL NIL NIL "base64" 1194 ("Tue, 14 Dec 2021 10:48:25 +0000" "HTML test" (("Name" NIL "email" "example.com")) (("Name" NIL "email" "example.com")) (("Name" NIL "email" "example.com")) (("email@example.com" NIL "email" "example.com")) NIL NIL NIL "<random-message-id@example.com>") (("text" "plain" ("charset" "utf-8" "format" "flowed") NIL NIL "7bit" 30 0) ("text" "html" ("charset" "utf-8") NIL NIL "7bit" 173 8) "alternative") 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/rfc/008.stalwart.0.2.0.bodystructure b/tests/emails/rfc/008.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..900d7ff
--- /dev/null
+++ b/tests/emails/rfc/008.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "utf-8") NIL NIL "7bit" 54 0 "e377afc895a2c4c0d17b378f355de59e" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL "base64" 1194 ("Tue, 14 Dec 2021 10:48:25 +0000" "HTML test" (("Name" NIL "email" "example.com")) (("Name" NIL "email" "example.com")) (("Name" NIL "email" "example.com")) (("email@example.com" NIL "email" "example.com")) NIL NIL NIL "<random-message-id@example.com>") (("text" "plain" ("charset" "utf-8" "format" "flowed") NIL NIL "7bit" 30 0 "6891396510cbadf4e2cfe31aee5bd25f" NIL NIL NIL) ("text" "html" ("charset" "utf-8") NIL NIL "7bit" 173 8 "1a04bd2ec90f44a42792eacdc14fe8ea" NIL NIL NIL) "alternative" ("boundary" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") NIL "en-US" NIL) 0 "ce223c5ac20984fb34004b937e5c5143" ("attachment" ("filename" "attached_email.eml")) NIL NIL) "mixed" ("boundary" "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/000.stalwart.0.2.0.body b/tests/emails/thirdparty/000.stalwart.0.2.0.body
new file mode 100644
index 0000000..e3a7dba
--- /dev/null
+++ b/tests/emails/thirdparty/000.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 499 37))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/000.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/000.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..5b6de7f
--- /dev/null
+++ b/tests/emails/thirdparty/000.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 499 37 "105c627f16f69db69bee67388ec2742d" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/001.stalwart.0.2.0.body b/tests/emails/thirdparty/001.stalwart.0.2.0.body
new file mode 100644
index 0000000..8a1916c
--- /dev/null
+++ b/tests/emails/thirdparty/001.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 559 46))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/001.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/001.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..aa7f38a
--- /dev/null
+++ b/tests/emails/thirdparty/001.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 559 46 "cab8a8d771b90fbf15d7854c9ddb4180" NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/002.stalwart.0.2.0.body b/tests/emails/thirdparty/002.stalwart.0.2.0.body
new file mode 100644
index 0000000..5f8d5fe
--- /dev/null
+++ b/tests/emails/thirdparty/002.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "utf-8") NIL NIL "quoted-printable" 23 1) ("text" "plain" ("charset" "utf-8") NIL NIL "base64" 28 0) ("text" "plain" ("charset" "utf-8") NIL NIL "base64" 8 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/002.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/002.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..0d5b1f1
--- /dev/null
+++ b/tests/emails/thirdparty/002.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "utf-8") NIL NIL "quoted-printable" 23 1 "662f10fbf9590f1e915b77b0f7d7f2f4" NIL NIL NIL) ("text" "plain" ("charset" "utf-8") NIL NIL "base64" 28 0 "c68ae9e42bc953e54498266535db5162" NIL NIL NIL) ("text" "plain" ("charset" "utf-8") NIL NIL "base64" 8 0 "2175a12df2d19e60841f96d91daae622" NIL NIL NIL) "mixed" ("boundary" "foo") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/003.stalwart.0.2.0.body b/tests/emails/thirdparty/003.stalwart.0.2.0.body
new file mode 100644
index 0000000..73c8f72
--- /dev/null
+++ b/tests/emails/thirdparty/003.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 35 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "binary" 23 1) ("text" "plain" ("charset" "us-ascii") NIL NIL "8bit" 66 3) ("text" "plain" ("charset" "us-ascii") NIL NIL "quoted-printable" 84 3) ("text" "plain" ("charset" "UTF-8") NIL NIL "base64" 34 1) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/003.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/003.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..50a15a4
--- /dev/null
+++ b/tests/emails/thirdparty/003.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 35 1 "0aa0f6a5b6d1663dec4380aa8bb7b353" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "binary" 23 1 "6fbc59c2d481137453b2073d79a13c85" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "8bit" 66 3 "d496db394f2e791c033d36add138f54f" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "quoted-printable" 84 3 "27c3ee1df4770f39b98b81fb2c8a8b51" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "base64" 34 1 "0a99fa566343f8e243b9aa77655c51b4" NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/004.stalwart.0.2.0.body b/tests/emails/thirdparty/004.stalwart.0.2.0.body
new file mode 100644
index 0000000..244c5ff
--- /dev/null
+++ b/tests/emails/thirdparty/004.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "UTF-8") NIL NIL "6bit" 35 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "7bits" 23 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "8 bit" 23 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "7-bit" 23 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "8-bit" 23 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "7bit" 41 1) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/004.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/004.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..229ef90
--- /dev/null
+++ b/tests/emails/thirdparty/004.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "UTF-8") NIL NIL "6bit" 35 1 "0aa0f6a5b6d1663dec4380aa8bb7b353" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "7bits" 23 1 "6fbc59c2d481137453b2073d79a13c85" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "8 bit" 23 1 "6fbc59c2d481137453b2073d79a13c85" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "7-bit" 23 1 "6fbc59c2d481137453b2073d79a13c85" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "8-bit" 23 1 "6fbc59c2d481137453b2073d79a13c85" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "7bit" 41 1 "22c0843a98e178b598f48407534b0801" NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/005.stalwart.0.2.0.body b/tests/emails/thirdparty/005.stalwart.0.2.0.body
new file mode 100644
index 0000000..add1d3c
--- /dev/null
+++ b/tests/emails/thirdparty/005.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "utf-16le") NIL NIL "binary" 27 1) ("text" "plain" ("charset" "utf-16be") NIL NIL "base64" 38 1) ("text" "plain" ("charset" "utf-16le") NIL NIL "base64" 38 1) ("text" "plain" ("charset" "EUC-JP") NIL NIL "base64" 26 1) ("text" "plain" ("charset" "UTF-8") NIL NIL "binary" 7 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/005.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/005.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..9334e4f
--- /dev/null
+++ b/tests/emails/thirdparty/005.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "utf-16le") NIL NIL "binary" 27 1 "99599ff0f5ab5740974fe1b54eac3640" NIL NIL NIL) ("text" "plain" ("charset" "utf-16be") NIL NIL "base64" 38 1 "b08f107f8c1aa6aaf44bde82529d7599" NIL NIL NIL) ("text" "plain" ("charset" "utf-16le") NIL NIL "base64" 38 1 "bc8fb5cc64de20d85a5b6c73e48c46db" NIL NIL NIL) ("text" "plain" ("charset" "EUC-JP") NIL NIL "base64" 26 1 "5b21183a2a790dfa913e5fcce5796e7e" NIL NIL NIL) ("text" "plain" ("charset" "UTF-8") NIL NIL "binary" 7 0 "fedb2d84cafe20862cb4399751a8a7e3" NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/006.stalwart.0.2.0.body b/tests/emails/thirdparty/006.stalwart.0.2.0.body
new file mode 100644
index 0000000..f529922
--- /dev/null
+++ b/tests/emails/thirdparty/006.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (((("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 90 1) ("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 27 0) "alternative") ("signature" "plain" ("charset" "us-ascii") NIL NIL NIL 21) "signed") "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/006.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/006.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..5df14bf
--- /dev/null
+++ b/tests/emails/thirdparty/006.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 90 1 "179c6f689e8949ac18ab5fb9e1691293" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 27 0 "a89ab85d23d7dcc39b09b24724806d5e" NIL NIL NIL) "alternative" ("boundary" "3") NIL NIL NIL) ("signature" "plain" ("charset" "us-ascii") NIL NIL NIL 21 "bc3b3f02afd16a21f3b4bec4d7da2b88" NIL NIL NIL) "signed" ("protocol" "signature/plain" "migalc" "pen+paper" "boundary" "2") NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/007.stalwart.0.2.0.body b/tests/emails/thirdparty/007.stalwart.0.2.0.body
new file mode 100644
index 0000000..9bb66ea
--- /dev/null
+++ b/tests/emails/thirdparty/007.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("message" NIL NIL NIL NIL NIL 76 (NIL "my opinion" (("someone-else" NIL "someone" "else")) (("someone-else" NIL "someone" "else")) (("someone-else" NIL "someone" "else")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 18 0) 0) ("message" NIL NIL NIL NIL NIL 77 (NIL "i disagree" (("another one" NIL "another" "one")) (("another one" NIL "another" "one")) (("another one" NIL "another" "one")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 21 0) 0) ("message" NIL NIL NIL NIL NIL 332 (NIL "funny hat" (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) NIL NIL NIL NIL NIL) (("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 25 0) ("application" "octet-stream" ("disposition" "attachment" "name" "test.txt") NIL NIL "binary" 6) "mixed") 0) "digest"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/007.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/007.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..4a74e93
--- /dev/null
+++ b/tests/emails/thirdparty/007.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("message" NIL NIL NIL NIL NIL 76 (NIL "my opinion" (("someone-else" NIL "someone" "else")) (("someone-else" NIL "someone" "else")) (("someone-else" NIL "someone" "else")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 18 0 "f24a4fcedd50839c81e85f32b99598b3" NIL NIL NIL) 0 "7c5221c3c677713eae93527a7c020d2f" NIL NIL NIL) ("message" NIL NIL NIL NIL NIL 77 (NIL "i disagree" (("another one" NIL "another" "one")) (("another one" NIL "another" "one")) (("another one" NIL "another" "one")) NIL NIL NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 21 0 "1a711eb1737bdc455529e1dbed87d086" NIL NIL NIL) 0 "201d396d62bdc49314667939e6d5c31d" NIL NIL NIL) ("message" NIL NIL NIL NIL NIL 332 (NIL "funny hat" (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) NIL NIL NIL NIL NIL) (("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 25 0 "c0c3c78b7d00a1befc35bd250d1f572f" NIL NIL NIL) ("application" "octet-stream" ("disposition" "attachment" "name" "test.txt") NIL NIL "binary" 6 "89d5739baabbbe65be35cbe61c88e06d" NIL NIL NIL) "mixed" ("boundary" "2") NIL NIL NIL) 0 "09f2fda42afa6ded9ad0b90ebb5665d4" NIL NIL NIL) "digest" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/008.stalwart.0.2.0.body b/tests/emails/thirdparty/008.stalwart.0.2.0.body
new file mode 100644
index 0000000..23e3b28
--- /dev/null
+++ b/tests/emails/thirdparty/008.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "x-myown" ("charset" "us-ascii") NIL NIL "7bit" 7 1) ("message" "rfc822" NIL NIL NIL NIL 465 ("Sun, 12 Aug 2012 09:34:56 +0000" "submsg" ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) NIL NIL NIL NIL NIL) (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 20 1) ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 9 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 10 0) "alternative") ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 10 0) "alternative") "alternative") 0) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/008.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/008.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..36727bd
--- /dev/null
+++ b/tests/emails/thirdparty/008.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "x-myown" ("charset" "us-ascii") NIL NIL "7bit" 7 1 "af5597c29467a96523a70787c319f4db" NIL NIL NIL) ("message" "rfc822" NIL NIL NIL NIL 465 ("Sun, 12 Aug 2012 09:34:56 +0000" "submsg" ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) NIL NIL NIL NIL NIL) (("text" "html" ("charset" "us-ascii") NIL NIL "7bit" 20 1 "5bf4e466d2a30d31e3beaa452bd44d7e" NIL NIL NIL) ((("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 9 0 "c4bb4bff59bc6b689a7d771456ba8326" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 10 0 "e360be28c26dbf7cb2caf925efe9cea2" NIL NIL NIL) "alternative" ("boundary" "sub3") NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 10 0 "6c43dba6267e4d7d473719aec6950c28" NIL NIL NIL) "alternative" ("boundary" "sub2") NIL NIL NIL) "alternative" ("boundary" "sub1") NIL NIL NIL) 0 "90ed9493c808ec2f0036537d014a2ba5" NIL NIL NIL) ("text" "plain" ("charset" "us-ascii") NIL NIL "7bit" 12 0 "80631f05804d6deda6cd6b730c81ce68" NIL NIL NIL) "mixed" ("boundary" "foo bar") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/009.stalwart.0.2.0.body b/tests/emails/thirdparty/009.stalwart.0.2.0.body
new file mode 100644
index 0000000..5736a18
--- /dev/null
+++ b/tests/emails/thirdparty/009.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 48 0) ("message" "partial" ("number" "1" "total" "5" "id" "heks68ewe@example.org") NIL NIL NIL 247) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/009.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/009.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..ad65072
--- /dev/null
+++ b/tests/emails/thirdparty/009.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 48 0 "0190086b152d010f49895814f582095e" NIL NIL NIL) ("message" "partial" ("number" "1" "total" "5" "id" "heks68ewe@example.org") NIL NIL NIL 247 "393a30c7c54c5ce6453f6d46f43d00c1" NIL NIL NIL) "mixed" ("boundary" "1") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/010.stalwart.0.2.0.body b/tests/emails/thirdparty/010.stalwart.0.2.0.body
new file mode 100644
index 0000000..01164f5
--- /dev/null
+++ b/tests/emails/thirdparty/010.stalwart.0.2.0.body
@@ -0,0 +1 @@
+(BODY (("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 18 0) "mixed"))
\ No newline at end of file
diff --git a/tests/emails/thirdparty/010.stalwart.0.2.0.bodystructure b/tests/emails/thirdparty/010.stalwart.0.2.0.bodystructure
new file mode 100644
index 0000000..0bb2a55
--- /dev/null
+++ b/tests/emails/thirdparty/010.stalwart.0.2.0.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("text" "plain" ("charset" "us-ascii") NIL NIL "binary" 18 0 "1f3db348384da1a1be4ad2ae06c8e5ce" NIL "ja" NIL) "mixed" ("boundary" "1" "comment" "人権の無視及") NIL NIL NIL))
\ No newline at end of file
diff --git a/tests/send-to-imap.py b/tests/send-to-imap.py
index b707570..df49076 100644
--- a/tests/send-to-imap.py
+++ b/tests/send-to-imap.py
@@ -50,6 +50,14 @@ parameters = {
     "pw": "pass",
     "ext": ".cyrus",
     "mb": "INBOX."+base_test_mb,
+  },
+  "stalwart": {
+    "con": IMAP4_SSL,
+    "port": 1993,
+    "user": "test@example.com",
+    "pw": "pass",
+    "ext": ".stalwart.0.2.0",
+    "mb": base_test_mb,
   }
 }