aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2022-07-07 18:19:37 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2022-07-07 18:19:37 +0200
commitaa6580e0c3fe577283ea1e9d17c092ab8f8a64b0 (patch)
tree9b96810a316069e5c19bae21c83d50869f6c1107
parente10d3987e2d84ef8499bb41910e129db2a9c2b9a (diff)
downloadaerogramme-aa6580e0c3fe577283ea1e9d17c092ab8f8a64b0.tar.gz
aerogramme-aa6580e0c3fe577283ea1e9d17c092ab8f8a64b0.zip
Add Cyrus + Identify Dovecot traces in filename
-rw-r--r--tests/emails/dxflrs/0001_simple.cyrus.body1
-rw-r--r--tests/emails/dxflrs/0001_simple.cyrus.bodystructure1
-rw-r--r--tests/emails/dxflrs/0001_simple.dovecot.body (renamed from tests/emails/dxflrs/0001_simple.body)0
-rw-r--r--tests/emails/dxflrs/0001_simple.dovecot.bodystructure (renamed from tests/emails/dxflrs/0001_simple.bodystructure)0
-rw-r--r--tests/emails/dxflrs/0002_mime.cyrus.body1
-rw-r--r--tests/emails/dxflrs/0002_mime.cyrus.bodystructure1
-rw-r--r--tests/emails/dxflrs/0002_mime.dovecot.body (renamed from tests/emails/dxflrs/0002_mime.body)0
-rw-r--r--tests/emails/dxflrs/0002_mime.dovecot.bodystructure (renamed from tests/emails/dxflrs/0002_mime.bodystructure)0
-rw-r--r--tests/emails/dxflrs/0003_mime-in-mime.cyrus.body1
-rw-r--r--tests/emails/dxflrs/0003_mime-in-mime.cyrus.bodystructure1
-rw-r--r--tests/emails/dxflrs/0003_mime-in-mime.dovecot.body (renamed from tests/emails/dxflrs/0003_mime-in-mime.body)0
-rw-r--r--tests/emails/dxflrs/0003_mime-in-mime.dovecot.bodystructure (renamed from tests/emails/dxflrs/0003_mime-in-mime.bodystructure)0
-rw-r--r--tests/emails/dxflrs/0004_msg-in-msg.cyrus.body1
-rw-r--r--tests/emails/dxflrs/0004_msg-in-msg.cyrus.bodystructure1
-rw-r--r--tests/emails/dxflrs/0004_msg-in-msg.dovecot.body (renamed from tests/emails/dxflrs/0004_msg-in-msg.body)0
-rw-r--r--tests/emails/dxflrs/0004_msg-in-msg.dovecot.bodystructure (renamed from tests/emails/dxflrs/0004_msg-in-msg.bodystructure)0
-rw-r--r--tests/emails/dxflrs/0005_mail-parser-readme.cyrus.body1
-rw-r--r--tests/emails/dxflrs/0005_mail-parser-readme.cyrus.bodystructure1
-rw-r--r--tests/emails/dxflrs/0005_mail-parser-readme.dovecot.body (renamed from tests/emails/dxflrs/0005_mail-parser-readme.body)0
-rw-r--r--tests/emails/dxflrs/0005_mail-parser-readme.dovecot.bodystructure (renamed from tests/emails/dxflrs/0005_mail-parser-readme.bodystructure)0
-rw-r--r--tests/emails/legacy/000.cyrus.body1
-rw-r--r--tests/emails/legacy/000.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/000.dovecot.body (renamed from tests/emails/legacy/000.body)0
-rw-r--r--tests/emails/legacy/000.dovecot.bodystructure (renamed from tests/emails/legacy/000.bodystructure)0
-rw-r--r--tests/emails/legacy/001.cyrus.body1
-rw-r--r--tests/emails/legacy/001.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/001.dovecot.body (renamed from tests/emails/legacy/001.body)0
-rw-r--r--tests/emails/legacy/001.dovecot.bodystructure (renamed from tests/emails/legacy/001.bodystructure)0
-rw-r--r--tests/emails/legacy/002.cyrus.body1
-rw-r--r--tests/emails/legacy/002.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/002.dovecot.body (renamed from tests/emails/legacy/002.body)0
-rw-r--r--tests/emails/legacy/002.dovecot.bodystructure (renamed from tests/emails/legacy/002.bodystructure)0
-rw-r--r--tests/emails/legacy/003.cyrus.body1
-rw-r--r--tests/emails/legacy/003.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/003.dovecot.body (renamed from tests/emails/legacy/003.body)0
-rw-r--r--tests/emails/legacy/003.dovecot.bodystructure (renamed from tests/emails/legacy/003.bodystructure)0
-rw-r--r--tests/emails/legacy/004.cyrus.body1
-rw-r--r--tests/emails/legacy/004.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/004.dovecot.body (renamed from tests/emails/legacy/004.body)0
-rw-r--r--tests/emails/legacy/004.dovecot.bodystructure (renamed from tests/emails/legacy/004.bodystructure)0
-rw-r--r--tests/emails/legacy/005.cyrus.body1
-rw-r--r--tests/emails/legacy/005.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/005.dovecot.body (renamed from tests/emails/legacy/005.body)0
-rw-r--r--tests/emails/legacy/005.dovecot.bodystructure (renamed from tests/emails/legacy/005.bodystructure)0
-rw-r--r--tests/emails/legacy/006.cyrus.body1
-rw-r--r--tests/emails/legacy/006.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/006.dovecot.body (renamed from tests/emails/legacy/006.body)0
-rw-r--r--tests/emails/legacy/006.dovecot.bodystructure (renamed from tests/emails/legacy/006.bodystructure)0
-rw-r--r--tests/emails/legacy/007.cyrus.body1
-rw-r--r--tests/emails/legacy/007.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/007.dovecot.body (renamed from tests/emails/legacy/007.body)0
-rw-r--r--tests/emails/legacy/007.dovecot.bodystructure (renamed from tests/emails/legacy/007.bodystructure)0
-rw-r--r--tests/emails/legacy/008.cyrus.body1
-rw-r--r--tests/emails/legacy/008.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/008.dovecot.body (renamed from tests/emails/legacy/008.body)0
-rw-r--r--tests/emails/legacy/008.dovecot.bodystructure (renamed from tests/emails/legacy/008.bodystructure)0
-rw-r--r--tests/emails/legacy/009.cyrus.body1
-rw-r--r--tests/emails/legacy/009.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/009.dovecot.body (renamed from tests/emails/legacy/009.body)0
-rw-r--r--tests/emails/legacy/009.dovecot.bodystructure (renamed from tests/emails/legacy/009.bodystructure)0
-rw-r--r--tests/emails/legacy/010.cyrus.body1
-rw-r--r--tests/emails/legacy/010.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/010.dovecot.body (renamed from tests/emails/legacy/010.body)0
-rw-r--r--tests/emails/legacy/010.dovecot.bodystructure (renamed from tests/emails/legacy/010.bodystructure)0
-rw-r--r--tests/emails/legacy/011.cyrus.body1
-rw-r--r--tests/emails/legacy/011.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/011.dovecot.body (renamed from tests/emails/legacy/011.body)0
-rw-r--r--tests/emails/legacy/011.dovecot.bodystructure (renamed from tests/emails/legacy/011.bodystructure)0
-rw-r--r--tests/emails/legacy/012.cyrus.body1
-rw-r--r--tests/emails/legacy/012.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/012.dovecot.body (renamed from tests/emails/legacy/012.body)0
-rw-r--r--tests/emails/legacy/012.dovecot.bodystructure (renamed from tests/emails/legacy/012.bodystructure)0
-rw-r--r--tests/emails/legacy/013.cyrus.body1
-rw-r--r--tests/emails/legacy/013.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/013.dovecot.body (renamed from tests/emails/legacy/013.body)0
-rw-r--r--tests/emails/legacy/013.dovecot.bodystructure (renamed from tests/emails/legacy/013.bodystructure)0
-rw-r--r--tests/emails/legacy/014.cyrus.body1
-rw-r--r--tests/emails/legacy/014.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/014.dovecot.body (renamed from tests/emails/legacy/014.body)0
-rw-r--r--tests/emails/legacy/014.dovecot.bodystructure (renamed from tests/emails/legacy/014.bodystructure)0
-rw-r--r--tests/emails/legacy/015.cyrus.body1
-rw-r--r--tests/emails/legacy/015.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/015.dovecot.body (renamed from tests/emails/legacy/015.body)0
-rw-r--r--tests/emails/legacy/015.dovecot.bodystructure (renamed from tests/emails/legacy/015.bodystructure)0
-rw-r--r--tests/emails/legacy/016.cyrus.body2
-rw-r--r--tests/emails/legacy/016.cyrus.bodystructure3
-rw-r--r--tests/emails/legacy/016.dovecot.body (renamed from tests/emails/legacy/016.body)0
-rw-r--r--tests/emails/legacy/016.dovecot.bodystructure (renamed from tests/emails/legacy/016.bodystructure)0
-rw-r--r--tests/emails/legacy/017.cyrus.body1
-rw-r--r--tests/emails/legacy/017.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/017.dovecot.body (renamed from tests/emails/legacy/017.body)0
-rw-r--r--tests/emails/legacy/017.dovecot.bodystructure (renamed from tests/emails/legacy/017.bodystructure)0
-rw-r--r--tests/emails/legacy/018.cyrus.body1
-rw-r--r--tests/emails/legacy/018.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/018.dovecot.body (renamed from tests/emails/legacy/018.body)0
-rw-r--r--tests/emails/legacy/018.dovecot.bodystructure (renamed from tests/emails/legacy/018.bodystructure)0
-rw-r--r--tests/emails/legacy/019.cyrus.body1
-rw-r--r--tests/emails/legacy/019.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/019.dovecot.body (renamed from tests/emails/legacy/019.body)0
-rw-r--r--tests/emails/legacy/019.dovecot.bodystructure (renamed from tests/emails/legacy/019.bodystructure)0
-rw-r--r--tests/emails/legacy/020.cyrus.body1
-rw-r--r--tests/emails/legacy/020.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/020.dovecot.body (renamed from tests/emails/legacy/020.body)0
-rw-r--r--tests/emails/legacy/020.dovecot.bodystructure (renamed from tests/emails/legacy/020.bodystructure)0
-rw-r--r--tests/emails/legacy/021.cyrus.body1
-rw-r--r--tests/emails/legacy/021.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/021.dovecot.body (renamed from tests/emails/legacy/021.body)0
-rw-r--r--tests/emails/legacy/021.dovecot.bodystructure (renamed from tests/emails/legacy/021.bodystructure)0
-rw-r--r--tests/emails/legacy/022.cyrus.body1
-rw-r--r--tests/emails/legacy/022.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/022.dovecot.body (renamed from tests/emails/legacy/022.body)0
-rw-r--r--tests/emails/legacy/022.dovecot.bodystructure (renamed from tests/emails/legacy/022.bodystructure)0
-rw-r--r--tests/emails/legacy/023.cyrus.body1
-rw-r--r--tests/emails/legacy/023.cyrus.bodystructure2
-rw-r--r--tests/emails/legacy/023.dovecot.body (renamed from tests/emails/legacy/023.body)0
-rw-r--r--tests/emails/legacy/023.dovecot.bodystructure (renamed from tests/emails/legacy/023.bodystructure)0
-rw-r--r--tests/emails/legacy/024.cyrus.body1
-rw-r--r--tests/emails/legacy/024.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/024.dovecot.body (renamed from tests/emails/legacy/024.body)0
-rw-r--r--tests/emails/legacy/024.dovecot.bodystructure (renamed from tests/emails/legacy/024.bodystructure)0
-rw-r--r--tests/emails/legacy/025.cyrus.body1
-rw-r--r--tests/emails/legacy/025.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/025.dovecot.body (renamed from tests/emails/legacy/025.body)0
-rw-r--r--tests/emails/legacy/025.dovecot.bodystructure (renamed from tests/emails/legacy/025.bodystructure)0
-rw-r--r--tests/emails/legacy/026.cyrus.body2
-rw-r--r--tests/emails/legacy/026.cyrus.bodystructure3
-rw-r--r--tests/emails/legacy/026.dovecot.body (renamed from tests/emails/legacy/026.body)0
-rw-r--r--tests/emails/legacy/026.dovecot.bodystructure (renamed from tests/emails/legacy/026.bodystructure)0
-rw-r--r--tests/emails/legacy/027.cyrus.body1
-rw-r--r--tests/emails/legacy/027.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/027.dovecot.body (renamed from tests/emails/legacy/027.body)0
-rw-r--r--tests/emails/legacy/027.dovecot.bodystructure (renamed from tests/emails/legacy/027.bodystructure)0
-rw-r--r--tests/emails/legacy/028.cyrus.body1
-rw-r--r--tests/emails/legacy/028.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/028.dovecot.body (renamed from tests/emails/legacy/028.body)0
-rw-r--r--tests/emails/legacy/028.dovecot.bodystructure (renamed from tests/emails/legacy/028.bodystructure)0
-rw-r--r--tests/emails/legacy/029.cyrus.body1
-rw-r--r--tests/emails/legacy/029.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/029.dovecot.body (renamed from tests/emails/legacy/029.body)0
-rw-r--r--tests/emails/legacy/029.dovecot.bodystructure (renamed from tests/emails/legacy/029.bodystructure)0
-rw-r--r--tests/emails/legacy/030.cyrus.body1
-rw-r--r--tests/emails/legacy/030.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/030.dovecot.body (renamed from tests/emails/legacy/030.body)0
-rw-r--r--tests/emails/legacy/030.dovecot.bodystructure (renamed from tests/emails/legacy/030.bodystructure)0
-rw-r--r--tests/emails/legacy/031.cyrus.body1
-rw-r--r--tests/emails/legacy/031.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/031.dovecot.body (renamed from tests/emails/legacy/031.body)0
-rw-r--r--tests/emails/legacy/031.dovecot.bodystructure (renamed from tests/emails/legacy/031.bodystructure)0
-rw-r--r--tests/emails/legacy/032.cyrus.body1
-rw-r--r--tests/emails/legacy/032.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/032.dovecot.body (renamed from tests/emails/legacy/032.body)0
-rw-r--r--tests/emails/legacy/032.dovecot.bodystructure (renamed from tests/emails/legacy/032.bodystructure)0
-rw-r--r--tests/emails/legacy/033.cyrus.body1
-rw-r--r--tests/emails/legacy/033.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/033.dovecot.body (renamed from tests/emails/legacy/033.body)0
-rw-r--r--tests/emails/legacy/033.dovecot.bodystructure (renamed from tests/emails/legacy/033.bodystructure)0
-rw-r--r--tests/emails/legacy/034.cyrus.body1
-rw-r--r--tests/emails/legacy/034.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/034.dovecot.body (renamed from tests/emails/legacy/034.body)0
-rw-r--r--tests/emails/legacy/034.dovecot.bodystructure (renamed from tests/emails/legacy/034.bodystructure)0
-rw-r--r--tests/emails/legacy/035.cyrus.body1
-rw-r--r--tests/emails/legacy/035.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/035.dovecot.body (renamed from tests/emails/legacy/035.body)0
-rw-r--r--tests/emails/legacy/035.dovecot.bodystructure (renamed from tests/emails/legacy/035.bodystructure)0
-rw-r--r--tests/emails/legacy/036.cyrus.body1
-rw-r--r--tests/emails/legacy/036.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/036.dovecot.body (renamed from tests/emails/legacy/036.body)0
-rw-r--r--tests/emails/legacy/036.dovecot.bodystructure (renamed from tests/emails/legacy/036.bodystructure)0
-rw-r--r--tests/emails/legacy/037.cyrus.body1
-rw-r--r--tests/emails/legacy/037.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/037.dovecot.body (renamed from tests/emails/legacy/037.body)0
-rw-r--r--tests/emails/legacy/037.dovecot.bodystructure (renamed from tests/emails/legacy/037.bodystructure)0
-rw-r--r--tests/emails/legacy/038.cyrus.body1
-rw-r--r--tests/emails/legacy/038.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/038.dovecot.body (renamed from tests/emails/legacy/038.body)0
-rw-r--r--tests/emails/legacy/038.dovecot.bodystructure (renamed from tests/emails/legacy/038.bodystructure)0
-rw-r--r--tests/emails/legacy/039.cyrus.body1
-rw-r--r--tests/emails/legacy/039.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/039.dovecot.body (renamed from tests/emails/legacy/039.body)0
-rw-r--r--tests/emails/legacy/039.dovecot.bodystructure (renamed from tests/emails/legacy/039.bodystructure)0
-rw-r--r--tests/emails/legacy/040.cyrus.body1
-rw-r--r--tests/emails/legacy/040.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/040.dovecot.body (renamed from tests/emails/legacy/040.body)0
-rw-r--r--tests/emails/legacy/040.dovecot.bodystructure (renamed from tests/emails/legacy/040.bodystructure)0
-rw-r--r--tests/emails/legacy/041.cyrus.body1
-rw-r--r--tests/emails/legacy/041.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/041.dovecot.body (renamed from tests/emails/legacy/041.body)0
-rw-r--r--tests/emails/legacy/041.dovecot.bodystructure (renamed from tests/emails/legacy/041.bodystructure)0
-rw-r--r--tests/emails/legacy/042.cyrus.body1
-rw-r--r--tests/emails/legacy/042.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/042.dovecot.body (renamed from tests/emails/legacy/042.body)0
-rw-r--r--tests/emails/legacy/042.dovecot.bodystructure (renamed from tests/emails/legacy/042.bodystructure)0
-rw-r--r--tests/emails/legacy/043.cyrus.body1
-rw-r--r--tests/emails/legacy/043.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/043.dovecot.body (renamed from tests/emails/legacy/043.body)0
-rw-r--r--tests/emails/legacy/043.dovecot.bodystructure (renamed from tests/emails/legacy/043.bodystructure)0
-rw-r--r--tests/emails/legacy/044.cyrus.body1
-rw-r--r--tests/emails/legacy/044.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/044.dovecot.body (renamed from tests/emails/legacy/044.body)0
-rw-r--r--tests/emails/legacy/044.dovecot.bodystructure (renamed from tests/emails/legacy/044.bodystructure)0
-rw-r--r--tests/emails/legacy/045.cyrus.body2
-rw-r--r--tests/emails/legacy/045.cyrus.bodystructure3
-rw-r--r--tests/emails/legacy/045.dovecot.body (renamed from tests/emails/legacy/045.body)0
-rw-r--r--tests/emails/legacy/045.dovecot.bodystructure (renamed from tests/emails/legacy/045.bodystructure)0
-rw-r--r--tests/emails/legacy/046.cyrus.body1
-rw-r--r--tests/emails/legacy/046.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/046.dovecot.body (renamed from tests/emails/legacy/046.body)0
-rw-r--r--tests/emails/legacy/046.dovecot.bodystructure (renamed from tests/emails/legacy/046.bodystructure)0
-rw-r--r--tests/emails/legacy/047.cyrus.body1
-rw-r--r--tests/emails/legacy/047.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/047.dovecot.body (renamed from tests/emails/legacy/047.body)0
-rw-r--r--tests/emails/legacy/047.dovecot.bodystructure (renamed from tests/emails/legacy/047.bodystructure)0
-rw-r--r--tests/emails/legacy/048.cyrus.body1
-rw-r--r--tests/emails/legacy/048.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/048.dovecot.body (renamed from tests/emails/legacy/048.body)0
-rw-r--r--tests/emails/legacy/048.dovecot.bodystructure (renamed from tests/emails/legacy/048.bodystructure)0
-rw-r--r--tests/emails/legacy/049.cyrus.body1
-rw-r--r--tests/emails/legacy/049.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/049.dovecot.body (renamed from tests/emails/legacy/049.body)0
-rw-r--r--tests/emails/legacy/049.dovecot.bodystructure (renamed from tests/emails/legacy/049.bodystructure)0
-rw-r--r--tests/emails/legacy/050.cyrus.body1
-rw-r--r--tests/emails/legacy/050.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/050.dovecot.body (renamed from tests/emails/legacy/050.body)0
-rw-r--r--tests/emails/legacy/050.dovecot.bodystructure (renamed from tests/emails/legacy/050.bodystructure)0
-rw-r--r--tests/emails/legacy/051.cyrus.body1
-rw-r--r--tests/emails/legacy/051.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/051.dovecot.body (renamed from tests/emails/legacy/051.body)0
-rw-r--r--tests/emails/legacy/051.dovecot.bodystructure (renamed from tests/emails/legacy/051.bodystructure)0
-rw-r--r--tests/emails/legacy/052.cyrus.body1
-rw-r--r--tests/emails/legacy/052.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/052.dovecot.body (renamed from tests/emails/legacy/052.body)0
-rw-r--r--tests/emails/legacy/052.dovecot.bodystructure (renamed from tests/emails/legacy/052.bodystructure)0
-rw-r--r--tests/emails/legacy/053.cyrus.body1
-rw-r--r--tests/emails/legacy/053.cyrus.bodystructure1
-rw-r--r--tests/emails/legacy/053.dovecot.body (renamed from tests/emails/legacy/053.body)0
-rw-r--r--tests/emails/legacy/053.dovecot.bodystructure (renamed from tests/emails/legacy/053.bodystructure)0
-rw-r--r--tests/emails/rfc/000.cyrus.body1
-rw-r--r--tests/emails/rfc/000.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/000.dovecot.body (renamed from tests/emails/rfc/000.body)0
-rw-r--r--tests/emails/rfc/000.dovecot.bodystructure (renamed from tests/emails/rfc/000.bodystructure)0
-rw-r--r--tests/emails/rfc/001.cyrus.body1
-rw-r--r--tests/emails/rfc/001.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/001.dovecot.body (renamed from tests/emails/rfc/001.body)0
-rw-r--r--tests/emails/rfc/001.dovecot.bodystructure (renamed from tests/emails/rfc/001.bodystructure)0
-rw-r--r--tests/emails/rfc/002.cyrus.body1
-rw-r--r--tests/emails/rfc/002.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/002.dovecot.body (renamed from tests/emails/rfc/002.body)0
-rw-r--r--tests/emails/rfc/002.dovecot.bodystructure (renamed from tests/emails/rfc/002.bodystructure)0
-rw-r--r--tests/emails/rfc/003.cyrus.body1
-rw-r--r--tests/emails/rfc/003.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/003.dovecot.body (renamed from tests/emails/rfc/003.body)0
-rw-r--r--tests/emails/rfc/003.dovecot.bodystructure (renamed from tests/emails/rfc/003.bodystructure)0
-rw-r--r--tests/emails/rfc/004.cyrus.body1
-rw-r--r--tests/emails/rfc/004.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/004.dovecot.body (renamed from tests/emails/rfc/004.body)0
-rw-r--r--tests/emails/rfc/004.dovecot.bodystructure (renamed from tests/emails/rfc/004.bodystructure)0
-rw-r--r--tests/emails/rfc/005.cyrus.body1
-rw-r--r--tests/emails/rfc/005.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/005.dovecot.body (renamed from tests/emails/rfc/005.body)0
-rw-r--r--tests/emails/rfc/005.dovecot.bodystructure (renamed from tests/emails/rfc/005.bodystructure)0
-rw-r--r--tests/emails/rfc/006.cyrus.body1
-rw-r--r--tests/emails/rfc/006.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/006.dovecot.body (renamed from tests/emails/rfc/006.body)0
-rw-r--r--tests/emails/rfc/006.dovecot.bodystructure (renamed from tests/emails/rfc/006.bodystructure)0
-rw-r--r--tests/emails/rfc/007.cyrus.body1
-rw-r--r--tests/emails/rfc/007.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/007.dovecot.body (renamed from tests/emails/rfc/007.body)0
-rw-r--r--tests/emails/rfc/007.dovecot.bodystructure (renamed from tests/emails/rfc/007.bodystructure)0
-rw-r--r--tests/emails/rfc/008.cyrus.body1
-rw-r--r--tests/emails/rfc/008.cyrus.bodystructure1
-rw-r--r--tests/emails/rfc/008.dovecot.body (renamed from tests/emails/rfc/008.body)0
-rw-r--r--tests/emails/rfc/008.dovecot.bodystructure (renamed from tests/emails/rfc/008.bodystructure)0
-rw-r--r--tests/emails/thirdparty/000.cyrus.body1
-rw-r--r--tests/emails/thirdparty/000.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/000.dovecot.body (renamed from tests/emails/thirdparty/000.body)0
-rw-r--r--tests/emails/thirdparty/000.dovecot.bodystructure (renamed from tests/emails/thirdparty/000.bodystructure)0
-rw-r--r--tests/emails/thirdparty/001.cyrus.body1
-rw-r--r--tests/emails/thirdparty/001.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/001.dovecot.body (renamed from tests/emails/thirdparty/001.body)0
-rw-r--r--tests/emails/thirdparty/001.dovecot.bodystructure (renamed from tests/emails/thirdparty/001.bodystructure)0
-rw-r--r--tests/emails/thirdparty/002.cyrus.body1
-rw-r--r--tests/emails/thirdparty/002.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/002.dovecot.body (renamed from tests/emails/thirdparty/002.body)0
-rw-r--r--tests/emails/thirdparty/002.dovecot.bodystructure (renamed from tests/emails/thirdparty/002.bodystructure)0
-rw-r--r--tests/emails/thirdparty/003.cyrus.body1
-rw-r--r--tests/emails/thirdparty/003.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/003.dovecot.body (renamed from tests/emails/thirdparty/003.body)0
-rw-r--r--tests/emails/thirdparty/003.dovecot.bodystructure (renamed from tests/emails/thirdparty/003.bodystructure)0
-rw-r--r--tests/emails/thirdparty/004.cyrus.body1
-rw-r--r--tests/emails/thirdparty/004.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/004.dovecot.body (renamed from tests/emails/thirdparty/004.body)0
-rw-r--r--tests/emails/thirdparty/004.dovecot.bodystructure (renamed from tests/emails/thirdparty/004.bodystructure)0
-rw-r--r--tests/emails/thirdparty/005.dovecot.body (renamed from tests/emails/thirdparty/005.body)0
-rw-r--r--tests/emails/thirdparty/005.dovecot.bodystructure (renamed from tests/emails/thirdparty/005.bodystructure)0
-rw-r--r--tests/emails/thirdparty/006.cyrus.body1
-rw-r--r--tests/emails/thirdparty/006.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/006.dovecot.body (renamed from tests/emails/thirdparty/006.body)0
-rw-r--r--tests/emails/thirdparty/006.dovecot.bodystructure (renamed from tests/emails/thirdparty/006.bodystructure)0
-rw-r--r--tests/emails/thirdparty/007.cyrus.body1
-rw-r--r--tests/emails/thirdparty/007.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/007.dovecot.body (renamed from tests/emails/thirdparty/007.body)0
-rw-r--r--tests/emails/thirdparty/007.dovecot.bodystructure (renamed from tests/emails/thirdparty/007.bodystructure)0
-rw-r--r--tests/emails/thirdparty/008.cyrus.body1
-rw-r--r--tests/emails/thirdparty/008.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/008.dovecot.body (renamed from tests/emails/thirdparty/008.body)0
-rw-r--r--tests/emails/thirdparty/008.dovecot.bodystructure (renamed from tests/emails/thirdparty/008.bodystructure)0
-rw-r--r--tests/emails/thirdparty/009.cyrus.body1
-rw-r--r--tests/emails/thirdparty/009.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/009.dovecot.body (renamed from tests/emails/thirdparty/009.body)0
-rw-r--r--tests/emails/thirdparty/009.dovecot.bodystructure (renamed from tests/emails/thirdparty/009.bodystructure)0
-rw-r--r--tests/emails/thirdparty/010.cyrus.body1
-rw-r--r--tests/emails/thirdparty/010.cyrus.bodystructure1
-rw-r--r--tests/emails/thirdparty/010.dovecot.body (renamed from tests/emails/thirdparty/010.body)0
-rw-r--r--tests/emails/thirdparty/010.dovecot.bodystructure (renamed from tests/emails/thirdparty/010.bodystructure)0
-rw-r--r--tests/send-to-imap.py34
315 files changed, 199 insertions, 1 deletions
diff --git a/tests/emails/dxflrs/0001_simple.cyrus.body b/tests/emails/dxflrs/0001_simple.cyrus.body
new file mode 100644
index 0000000..9ddb995
--- /dev/null
+++ b/tests/emails/dxflrs/0001_simple.cyrus.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.cyrus.bodystructure b/tests/emails/dxflrs/0001_simple.cyrus.bodystructure
new file mode 100644
index 0000000..09bb755
--- /dev/null
+++ b/tests/emails/dxflrs/0001_simple.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 49 1 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0001_simple.body b/tests/emails/dxflrs/0001_simple.dovecot.body
index 7942837..7942837 100644
--- a/tests/emails/dxflrs/0001_simple.body
+++ b/tests/emails/dxflrs/0001_simple.dovecot.body
diff --git a/tests/emails/dxflrs/0001_simple.bodystructure b/tests/emails/dxflrs/0001_simple.dovecot.bodystructure
index 8f0e467..8f0e467 100644
--- a/tests/emails/dxflrs/0001_simple.bodystructure
+++ b/tests/emails/dxflrs/0001_simple.dovecot.bodystructure
diff --git a/tests/emails/dxflrs/0002_mime.cyrus.body b/tests/emails/dxflrs/0002_mime.cyrus.body
new file mode 100644
index 0000000..266e647
--- /dev/null
+++ b/tests/emails/dxflrs/0002_mime.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1)("TEXT" "HTML" ("CHARSET" "utf-8") NIL NIL "8BIT" 16 1) "ALTERNATIVE")) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0002_mime.cyrus.bodystructure b/tests/emails/dxflrs/0002_mime.cyrus.bodystructure
new file mode 100644
index 0000000..ea386b6
--- /dev/null
+++ b/tests/emails/dxflrs/0002_mime.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "utf-8") NIL NIL "8BIT" 16 1 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "festivus") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0002_mime.body b/tests/emails/dxflrs/0002_mime.dovecot.body
index a6c1dd9..a6c1dd9 100644
--- a/tests/emails/dxflrs/0002_mime.body
+++ b/tests/emails/dxflrs/0002_mime.dovecot.body
diff --git a/tests/emails/dxflrs/0002_mime.bodystructure b/tests/emails/dxflrs/0002_mime.dovecot.bodystructure
index 1dce36b..1dce36b 100644
--- a/tests/emails/dxflrs/0002_mime.bodystructure
+++ b/tests/emails/dxflrs/0002_mime.dovecot.bodystructure
diff --git a/tests/emails/dxflrs/0003_mime-in-mime.cyrus.body b/tests/emails/dxflrs/0003_mime-in-mime.cyrus.body
new file mode 100644
index 0000000..c810d09
--- /dev/null
+++ b/tests/emails/dxflrs/0003_mime-in-mime.cyrus.body
@@ -0,0 +1 @@
+(BODY ((("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1) "MIXED")("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0003_mime-in-mime.cyrus.bodystructure b/tests/emails/dxflrs/0003_mime-in-mime.cyrus.bodystructure
new file mode 100644
index 0000000..7d4f4ae
--- /dev/null
+++ b/tests/emails/dxflrs/0003_mime-in-mime.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "child") NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "parent") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0003_mime-in-mime.body b/tests/emails/dxflrs/0003_mime-in-mime.dovecot.body
index ddf0f6d..ddf0f6d 100644
--- a/tests/emails/dxflrs/0003_mime-in-mime.body
+++ b/tests/emails/dxflrs/0003_mime-in-mime.dovecot.body
diff --git a/tests/emails/dxflrs/0003_mime-in-mime.bodystructure b/tests/emails/dxflrs/0003_mime-in-mime.dovecot.bodystructure
index 903d343..903d343 100644
--- a/tests/emails/dxflrs/0003_mime-in-mime.bodystructure
+++ b/tests/emails/dxflrs/0003_mime-in-mime.dovecot.bodystructure
diff --git a/tests/emails/dxflrs/0004_msg-in-msg.cyrus.body b/tests/emails/dxflrs/0004_msg-in-msg.cyrus.body
new file mode 100644
index 0000000..d02b2e3
--- /dev/null
+++ b/tests/emails/dxflrs/0004_msg-in-msg.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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) 4) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0004_msg-in-msg.cyrus.bodystructure b/tests/emails/dxflrs/0004_msg-in-msg.cyrus.bodystructure
new file mode 100644
index 0000000..939e4fe
--- /dev/null
+++ b/tests/emails/dxflrs/0004_msg-in-msg.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 1 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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 NIL NIL NIL NIL) 4 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "delim") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0004_msg-in-msg.body b/tests/emails/dxflrs/0004_msg-in-msg.dovecot.body
index 9ff3336..9ff3336 100644
--- a/tests/emails/dxflrs/0004_msg-in-msg.body
+++ b/tests/emails/dxflrs/0004_msg-in-msg.dovecot.body
diff --git a/tests/emails/dxflrs/0004_msg-in-msg.bodystructure b/tests/emails/dxflrs/0004_msg-in-msg.dovecot.bodystructure
index a0d751a..a0d751a 100644
--- a/tests/emails/dxflrs/0004_msg-in-msg.bodystructure
+++ b/tests/emails/dxflrs/0004_msg-in-msg.dovecot.bodystructure
diff --git a/tests/emails/dxflrs/0005_mail-parser-readme.cyrus.body b/tests/emails/dxflrs/0005_mail-parser-readme.cyrus.body
new file mode 100644
index 0000000..1974cd5
--- /dev/null
+++ b/tests/emails/dxflrs/0005_mail-parser-readme.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "BASE64" 242 3)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 744 (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 ") NIL NIL "BASE64" 56) "MIXED") 20) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0005_mail-parser-readme.cyrus.bodystructure b/tests/emails/dxflrs/0005_mail-parser-readme.cyrus.bodystructure
new file mode 100644
index 0000000..5189948
--- /dev/null
+++ b/tests/emails/dxflrs/0005_mail-parser-readme.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "BASE64" 242 3 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 744 (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 NIL NIL NIL NIL)("IMAGE" "GIF" ("NAME" "Book about ") NIL NIL "BASE64" 56 NIL ("ATTACHMENT" NIL) NIL NIL) "MIXED" ("BOUNDARY" "giddyup") NIL NIL NIL) 20 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "festivus") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/dxflrs/0005_mail-parser-readme.body b/tests/emails/dxflrs/0005_mail-parser-readme.dovecot.body
index 2d2b350..2d2b350 100644
--- a/tests/emails/dxflrs/0005_mail-parser-readme.body
+++ b/tests/emails/dxflrs/0005_mail-parser-readme.dovecot.body
diff --git a/tests/emails/dxflrs/0005_mail-parser-readme.bodystructure b/tests/emails/dxflrs/0005_mail-parser-readme.dovecot.bodystructure
index e5d0af9..e5d0af9 100644
--- a/tests/emails/dxflrs/0005_mail-parser-readme.bodystructure
+++ b/tests/emails/dxflrs/0005_mail-parser-readme.dovecot.bodystructure
diff --git a/tests/emails/legacy/000.cyrus.body b/tests/emails/legacy/000.cyrus.body
new file mode 100644
index 0000000..06f9368
--- /dev/null
+++ b/tests/emails/legacy/000.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/000.cyrus.bodystructure
new file mode 100644
index 0000000..13215a2
--- /dev/null
+++ b/tests/emails/legacy/000.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "BASE64" 1994 NIL ("ATTACHMENT" ("FILENAME" "redball.png")) NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/000.body b/tests/emails/legacy/000.dovecot.body
index db3b477..db3b477 100644
--- a/tests/emails/legacy/000.body
+++ b/tests/emails/legacy/000.dovecot.body
diff --git a/tests/emails/legacy/000.bodystructure b/tests/emails/legacy/000.dovecot.bodystructure
index 2e4f8da..2e4f8da 100644
--- a/tests/emails/legacy/000.bodystructure
+++ b/tests/emails/legacy/000.dovecot.bodystructure
diff --git a/tests/emails/legacy/001.cyrus.body b/tests/emails/legacy/001.cyrus.body
new file mode 100644
index 0000000..4a59787
--- /dev/null
+++ b/tests/emails/legacy/001.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/001.cyrus.bodystructure
new file mode 100644
index 0000000..c65cb35
--- /dev/null
+++ b/tests/emails/legacy/001.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "utf-7") NIL NIL "QUOTED-PRINTABLE" 897 19 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/001.body b/tests/emails/legacy/001.dovecot.body
index 6b58e25..6b58e25 100644
--- a/tests/emails/legacy/001.body
+++ b/tests/emails/legacy/001.dovecot.body
diff --git a/tests/emails/legacy/001.bodystructure b/tests/emails/legacy/001.dovecot.bodystructure
index 2dfc948..2dfc948 100644
--- a/tests/emails/legacy/001.bodystructure
+++ b/tests/emails/legacy/001.dovecot.bodystructure
diff --git a/tests/emails/legacy/002.cyrus.body b/tests/emails/legacy/002.cyrus.body
new file mode 100644
index 0000000..d154d2e
--- /dev/null
+++ b/tests/emails/legacy/002.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/002.cyrus.bodystructure
new file mode 100644
index 0000000..87d5653
--- /dev/null
+++ b/tests/emails/legacy/002.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1001 25 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/002.body b/tests/emails/legacy/002.dovecot.body
index 1bb1b25..1bb1b25 100644
--- a/tests/emails/legacy/002.body
+++ b/tests/emails/legacy/002.dovecot.body
diff --git a/tests/emails/legacy/002.bodystructure b/tests/emails/legacy/002.dovecot.bodystructure
index a9869d6..a9869d6 100644
--- a/tests/emails/legacy/002.bodystructure
+++ b/tests/emails/legacy/002.dovecot.bodystructure
diff --git a/tests/emails/legacy/003.cyrus.body b/tests/emails/legacy/003.cyrus.body
new file mode 100644
index 0000000..c146e3e
--- /dev/null
+++ b/tests/emails/legacy/003.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/003.cyrus.bodystructure
new file mode 100644
index 0000000..229fade
--- /dev/null
+++ b/tests/emails/legacy/003.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 997 23 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "=====================_714967308==_.ALT") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/003.body b/tests/emails/legacy/003.dovecot.body
index dd5f3f5..dd5f3f5 100644
--- a/tests/emails/legacy/003.body
+++ b/tests/emails/legacy/003.dovecot.body
diff --git a/tests/emails/legacy/003.bodystructure b/tests/emails/legacy/003.dovecot.bodystructure
index 7bfea32..7bfea32 100644
--- a/tests/emails/legacy/003.bodystructure
+++ b/tests/emails/legacy/003.dovecot.bodystructure
diff --git a/tests/emails/legacy/004.cyrus.body b/tests/emails/legacy/004.cyrus.body
new file mode 100644
index 0000000..2dd19d4
--- /dev/null
+++ b/tests/emails/legacy/004.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/004.cyrus.bodystructure
new file mode 100644
index 0000000..7b382a5
--- /dev/null
+++ b/tests/emails/legacy/004.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 768 8 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/004.body b/tests/emails/legacy/004.dovecot.body
index ce32e5f..ce32e5f 100644
--- a/tests/emails/legacy/004.body
+++ b/tests/emails/legacy/004.dovecot.body
diff --git a/tests/emails/legacy/004.bodystructure b/tests/emails/legacy/004.dovecot.bodystructure
index c0f6cc5..c0f6cc5 100644
--- a/tests/emails/legacy/004.bodystructure
+++ b/tests/emails/legacy/004.dovecot.bodystructure
diff --git a/tests/emails/legacy/005.cyrus.body b/tests/emails/legacy/005.cyrus.body
new file mode 100644
index 0000000..8c1fb0b
--- /dev/null
+++ b/tests/emails/legacy/005.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/005.cyrus.bodystructure
new file mode 100644
index 0000000..d48e20d
--- /dev/null
+++ b/tests/emails/legacy/005.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "utf-7") NIL NIL "QUOTED-PRINTABLE" 895 18 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/005.body b/tests/emails/legacy/005.dovecot.body
index 9c9f327..9c9f327 100644
--- a/tests/emails/legacy/005.body
+++ b/tests/emails/legacy/005.dovecot.body
diff --git a/tests/emails/legacy/005.bodystructure b/tests/emails/legacy/005.dovecot.bodystructure
index 2e19c02..2e19c02 100644
--- a/tests/emails/legacy/005.bodystructure
+++ b/tests/emails/legacy/005.dovecot.bodystructure
diff --git a/tests/emails/legacy/006.cyrus.body b/tests/emails/legacy/006.cyrus.body
new file mode 100644
index 0000000..69fd5c6
--- /dev/null
+++ b/tests/emails/legacy/006.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/006.cyrus.bodystructure
new file mode 100644
index 0000000..fa88a1a
--- /dev/null
+++ b/tests/emails/legacy/006.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "BASE64" 1992 NIL ("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/006.body b/tests/emails/legacy/006.dovecot.body
index 79cfd16..79cfd16 100644
--- a/tests/emails/legacy/006.body
+++ b/tests/emails/legacy/006.dovecot.body
diff --git a/tests/emails/legacy/006.bodystructure b/tests/emails/legacy/006.dovecot.bodystructure
index 95a8c1d..95a8c1d 100644
--- a/tests/emails/legacy/006.bodystructure
+++ b/tests/emails/legacy/006.dovecot.bodystructure
diff --git a/tests/emails/legacy/007.cyrus.body b/tests/emails/legacy/007.cyrus.body
new file mode 100644
index 0000000..dfccf67
--- /dev/null
+++ b/tests/emails/legacy/007.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/007.cyrus.bodystructure
new file mode 100644
index 0000000..f7d2a82
--- /dev/null
+++ b/tests/emails/legacy/007.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 811 17 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/007.body b/tests/emails/legacy/007.dovecot.body
index 0da3296..0da3296 100644
--- a/tests/emails/legacy/007.body
+++ b/tests/emails/legacy/007.dovecot.body
diff --git a/tests/emails/legacy/007.bodystructure b/tests/emails/legacy/007.dovecot.bodystructure
index 82d4dd4..82d4dd4 100644
--- a/tests/emails/legacy/007.bodystructure
+++ b/tests/emails/legacy/007.dovecot.bodystructure
diff --git a/tests/emails/legacy/008.cyrus.body b/tests/emails/legacy/008.cyrus.body
new file mode 100644
index 0000000..4ba44f3
--- /dev/null
+++ b/tests/emails/legacy/008.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/008.cyrus.bodystructure
new file mode 100644
index 0000000..6ddfb33
--- /dev/null
+++ b/tests/emails/legacy/008.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 799 15 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1778 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "BASE64" 1992 NIL ("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/008.body b/tests/emails/legacy/008.dovecot.body
index 6392db3..6392db3 100644
--- a/tests/emails/legacy/008.body
+++ b/tests/emails/legacy/008.dovecot.body
diff --git a/tests/emails/legacy/008.bodystructure b/tests/emails/legacy/008.dovecot.bodystructure
index 0af4c2e..0af4c2e 100644
--- a/tests/emails/legacy/008.bodystructure
+++ b/tests/emails/legacy/008.dovecot.bodystructure
diff --git a/tests/emails/legacy/009.cyrus.body b/tests/emails/legacy/009.cyrus.body
new file mode 100644
index 0000000..9f660b4
--- /dev/null
+++ b/tests/emails/legacy/009.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/009.cyrus.bodystructure
new file mode 100644
index 0000000..7e3afdf
--- /dev/null
+++ b/tests/emails/legacy/009.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1" "FORMAT" "flowed") NIL NIL "QUOTED-PRINTABLE" 827 23 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/009.body b/tests/emails/legacy/009.dovecot.body
index 2fb8365..2fb8365 100644
--- a/tests/emails/legacy/009.body
+++ b/tests/emails/legacy/009.dovecot.body
diff --git a/tests/emails/legacy/009.bodystructure b/tests/emails/legacy/009.dovecot.bodystructure
index 1dd63ba..1dd63ba 100644
--- a/tests/emails/legacy/009.bodystructure
+++ b/tests/emails/legacy/009.dovecot.bodystructure
diff --git a/tests/emails/legacy/010.cyrus.body b/tests/emails/legacy/010.cyrus.body
new file mode 100644
index 0000000..5bc5b3b
--- /dev/null
+++ b/tests/emails/legacy/010.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/010.cyrus.bodystructure
new file mode 100644
index 0000000..c9023fe
--- /dev/null
+++ b/tests/emails/legacy/010.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "8BIT" 751 10 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/010.body b/tests/emails/legacy/010.dovecot.body
index 44a32c6..44a32c6 100644
--- a/tests/emails/legacy/010.body
+++ b/tests/emails/legacy/010.dovecot.body
diff --git a/tests/emails/legacy/010.bodystructure b/tests/emails/legacy/010.dovecot.bodystructure
index 46f7cf5..46f7cf5 100644
--- a/tests/emails/legacy/010.bodystructure
+++ b/tests/emails/legacy/010.dovecot.bodystructure
diff --git a/tests/emails/legacy/011.cyrus.body b/tests/emails/legacy/011.cyrus.body
new file mode 100644
index 0000000..f4764fe
--- /dev/null
+++ b/tests/emails/legacy/011.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/011.cyrus.bodystructure
new file mode 100644
index 0000000..9a9252c
--- /dev/null
+++ b/tests/emails/legacy/011.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 813 18 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/011.body b/tests/emails/legacy/011.dovecot.body
index 9ca312e..9ca312e 100644
--- a/tests/emails/legacy/011.body
+++ b/tests/emails/legacy/011.dovecot.body
diff --git a/tests/emails/legacy/011.bodystructure b/tests/emails/legacy/011.dovecot.bodystructure
index 6f5f792..6f5f792 100644
--- a/tests/emails/legacy/011.bodystructure
+++ b/tests/emails/legacy/011.dovecot.bodystructure
diff --git a/tests/emails/legacy/012.cyrus.body b/tests/emails/legacy/012.cyrus.body
new file mode 100644
index 0000000..a1779e0
--- /dev/null
+++ b/tests/emails/legacy/012.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/012.cyrus.bodystructure
new file mode 100644
index 0000000..9ee2c2d
--- /dev/null
+++ b/tests/emails/legacy/012.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "Windows-1252") NIL NIL "QUOTED-PRINTABLE" 809 16 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/012.body b/tests/emails/legacy/012.dovecot.body
index 5170de5..5170de5 100644
--- a/tests/emails/legacy/012.body
+++ b/tests/emails/legacy/012.dovecot.body
diff --git a/tests/emails/legacy/012.bodystructure b/tests/emails/legacy/012.dovecot.bodystructure
index d154b81..d154b81 100644
--- a/tests/emails/legacy/012.bodystructure
+++ b/tests/emails/legacy/012.dovecot.bodystructure
diff --git a/tests/emails/legacy/013.cyrus.body b/tests/emails/legacy/013.cyrus.body
new file mode 100644
index 0000000..dd76ce6
--- /dev/null
+++ b/tests/emails/legacy/013.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/013.cyrus.bodystructure
new file mode 100644
index 0000000..3ac67f4
--- /dev/null
+++ b/tests/emails/legacy/013.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "8BIT" 754 17 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/013.body b/tests/emails/legacy/013.dovecot.body
index 6b8e249..6b8e249 100644
--- a/tests/emails/legacy/013.body
+++ b/tests/emails/legacy/013.dovecot.body
diff --git a/tests/emails/legacy/013.bodystructure b/tests/emails/legacy/013.dovecot.bodystructure
index d630562..d630562 100644
--- a/tests/emails/legacy/013.bodystructure
+++ b/tests/emails/legacy/013.dovecot.bodystructure
diff --git a/tests/emails/legacy/014.cyrus.body b/tests/emails/legacy/014.cyrus.body
new file mode 100644
index 0000000..55d70d1
--- /dev/null
+++ b/tests/emails/legacy/014.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/014.cyrus.bodystructure
new file mode 100644
index 0000000..915e75a
--- /dev/null
+++ b/tests/emails/legacy/014.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 801 16 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1190 27 NIL 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/014.body b/tests/emails/legacy/014.dovecot.body
index 3a2abd9..3a2abd9 100644
--- a/tests/emails/legacy/014.body
+++ b/tests/emails/legacy/014.dovecot.body
diff --git a/tests/emails/legacy/014.bodystructure b/tests/emails/legacy/014.dovecot.bodystructure
index 5f795b2..5f795b2 100644
--- a/tests/emails/legacy/014.bodystructure
+++ b/tests/emails/legacy/014.dovecot.bodystructure
diff --git a/tests/emails/legacy/015.cyrus.body b/tests/emails/legacy/015.cyrus.body
new file mode 100644
index 0000000..7dab660
--- /dev/null
+++ b/tests/emails/legacy/015.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/015.cyrus.bodystructure
new file mode 100644
index 0000000..951dc55
--- /dev/null
+++ b/tests/emails/legacy/015.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 833 16 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1230 26 NIL 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 NIL ("INLINE" ("FILENAME" "2aa3ed95.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "2aa3edd1.png") "<4.2.0.58.20000519003556.00a918e0@pop.example.com.3>" NIL "BASE64" 1990 NIL ("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 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1776 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL) "MIXED" ("BOUNDARY" "=====================_715392540==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/015.body b/tests/emails/legacy/015.dovecot.body
index 50db72f..50db72f 100644
--- a/tests/emails/legacy/015.body
+++ b/tests/emails/legacy/015.dovecot.body
diff --git a/tests/emails/legacy/015.bodystructure b/tests/emails/legacy/015.dovecot.bodystructure
index b81fd92..b81fd92 100644
--- a/tests/emails/legacy/015.bodystructure
+++ b/tests/emails/legacy/015.dovecot.bodystructure
diff --git a/tests/emails/legacy/016.cyrus.body b/tests/emails/legacy/016.cyrus.body
new file mode 100644
index 0000000..c4ab66c
--- /dev/null
+++ b/tests/emails/legacy/016.cyrus.body
@@ -0,0 +1,2 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16)("APPLICATION" "MAC-BINHEX40" ("NAME" "blueball.png") NIL NIL "7BIT" 1929)("APPLICATION" "MAC-BINHEX40" ("NAME" {19}
+HasenundFrösche.txt) NIL NIL "7BIT" 1131) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/legacy/016.cyrus.bodystructure b/tests/emails/legacy/016.cyrus.bodystructure
new file mode 100644
index 0000000..0c69752
--- /dev/null
+++ b/tests/emails/legacy/016.cyrus.bodystructure
@@ -0,0 +1,3 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16 NIL NIL NIL NIL)("APPLICATION" "MAC-BINHEX40" ("NAME" "blueball.png") NIL NIL "7BIT" 1929 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("APPLICATION" "MAC-BINHEX40" ("NAME" {19}
+HasenundFrösche.txt) NIL NIL "7BIT" 1131 NIL ("ATTACHMENT" ("FILENAME" {19}
+HasenundFrösche.txt)) NIL NIL) "MIXED" ("BOUNDARY" "=====================_716373961==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/016.body b/tests/emails/legacy/016.dovecot.body
index e510c4e..e510c4e 100644
--- a/tests/emails/legacy/016.body
+++ b/tests/emails/legacy/016.dovecot.body
diff --git a/tests/emails/legacy/016.bodystructure b/tests/emails/legacy/016.dovecot.bodystructure
index 0caa9fd..0caa9fd 100644
--- a/tests/emails/legacy/016.bodystructure
+++ b/tests/emails/legacy/016.dovecot.bodystructure
diff --git a/tests/emails/legacy/017.cyrus.body b/tests/emails/legacy/017.cyrus.body
new file mode 100644
index 0000000..ed702dd
--- /dev/null
+++ b/tests/emails/legacy/017.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/017.cyrus.bodystructure
new file mode 100644
index 0000000..75518ca
--- /dev/null
+++ b/tests/emails/legacy/017.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 764 6 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "X-UUENCODE" 1854 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "X-UUENCODE" 1892 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL) "MIXED" ("BOUNDARY" "=====================_716177458==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/017.body b/tests/emails/legacy/017.dovecot.body
index 47bbc5a..47bbc5a 100644
--- a/tests/emails/legacy/017.body
+++ b/tests/emails/legacy/017.dovecot.body
diff --git a/tests/emails/legacy/017.bodystructure b/tests/emails/legacy/017.dovecot.bodystructure
index 3d01d46..3d01d46 100644
--- a/tests/emails/legacy/017.bodystructure
+++ b/tests/emails/legacy/017.dovecot.bodystructure
diff --git a/tests/emails/legacy/018.cyrus.body b/tests/emails/legacy/018.cyrus.body
new file mode 100644
index 0000000..724de98
--- /dev/null
+++ b/tests/emails/legacy/018.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/018.cyrus.bodystructure
new file mode 100644
index 0000000..bbc6bf1
--- /dev/null
+++ b/tests/emails/legacy/018.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 836 18 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1238 27 NIL 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 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") "<4.2.0.58.20000519003143.00a8d550@pop.example.com.1>" NIL "BASE64" 1990 NIL ("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/018.body b/tests/emails/legacy/018.dovecot.body
index 617e176..617e176 100644
--- a/tests/emails/legacy/018.body
+++ b/tests/emails/legacy/018.dovecot.body
diff --git a/tests/emails/legacy/018.bodystructure b/tests/emails/legacy/018.dovecot.bodystructure
index 17f54b4..17f54b4 100644
--- a/tests/emails/legacy/018.bodystructure
+++ b/tests/emails/legacy/018.dovecot.bodystructure
diff --git a/tests/emails/legacy/019.cyrus.body b/tests/emails/legacy/019.cyrus.body
new file mode 100644
index 0000000..28998da
--- /dev/null
+++ b/tests/emails/legacy/019.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/019.cyrus.bodystructure
new file mode 100644
index 0000000..d4dc188
--- /dev/null
+++ b/tests/emails/legacy/019.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 801 16 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1190 27 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "----=_NextPart_001_0009_01BFC037.FDD8EE90") NIL NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1778 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "BASE64" 1992 NIL ("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/019.body b/tests/emails/legacy/019.dovecot.body
index ea301e5..ea301e5 100644
--- a/tests/emails/legacy/019.body
+++ b/tests/emails/legacy/019.dovecot.body
diff --git a/tests/emails/legacy/019.bodystructure b/tests/emails/legacy/019.dovecot.bodystructure
index 080d481..080d481 100644
--- a/tests/emails/legacy/019.bodystructure
+++ b/tests/emails/legacy/019.dovecot.bodystructure
diff --git a/tests/emails/legacy/020.cyrus.body b/tests/emails/legacy/020.cyrus.body
new file mode 100644
index 0000000..dd76ce6
--- /dev/null
+++ b/tests/emails/legacy/020.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/020.cyrus.bodystructure
new file mode 100644
index 0000000..3ac67f4
--- /dev/null
+++ b/tests/emails/legacy/020.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "8BIT" 754 17 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/020.body b/tests/emails/legacy/020.dovecot.body
index 6b8e249..6b8e249 100644
--- a/tests/emails/legacy/020.body
+++ b/tests/emails/legacy/020.dovecot.body
diff --git a/tests/emails/legacy/020.bodystructure b/tests/emails/legacy/020.dovecot.bodystructure
index d630562..d630562 100644
--- a/tests/emails/legacy/020.bodystructure
+++ b/tests/emails/legacy/020.dovecot.bodystructure
diff --git a/tests/emails/legacy/021.cyrus.body b/tests/emails/legacy/021.cyrus.body
new file mode 100644
index 0000000..1c07acf
--- /dev/null
+++ b/tests/emails/legacy/021.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/021.cyrus.bodystructure
new file mode 100644
index 0000000..9627384
--- /dev/null
+++ b/tests/emails/legacy/021.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 805 18 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1397 31 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "----=_NextPart_002_0012_01BFC038.B91BC650") NIL NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") "<938014623@17052000-0f9b>" NIL "BASE64" 1816 NIL NIL NIL NIL) "RELATED" ("BOUNDARY" "----=_NextPart_001_0011_01BFC038.B91BC650") NIL NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1778 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "BASE64" 1992 NIL ("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/021.body b/tests/emails/legacy/021.dovecot.body
index 330c748..330c748 100644
--- a/tests/emails/legacy/021.body
+++ b/tests/emails/legacy/021.dovecot.body
diff --git a/tests/emails/legacy/021.bodystructure b/tests/emails/legacy/021.dovecot.bodystructure
index e746521..e746521 100644
--- a/tests/emails/legacy/021.bodystructure
+++ b/tests/emails/legacy/021.dovecot.bodystructure
diff --git a/tests/emails/legacy/022.cyrus.body b/tests/emails/legacy/022.cyrus.body
new file mode 100644
index 0000000..e244b7c
--- /dev/null
+++ b/tests/emails/legacy/022.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/022.cyrus.bodystructure
new file mode 100644
index 0000000..abb3f8c
--- /dev/null
+++ b/tests/emails/legacy/022.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "BASE64" 1028 16 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/022.body b/tests/emails/legacy/022.dovecot.body
index 7b1aef0..7b1aef0 100644
--- a/tests/emails/legacy/022.body
+++ b/tests/emails/legacy/022.dovecot.body
diff --git a/tests/emails/legacy/022.bodystructure b/tests/emails/legacy/022.dovecot.bodystructure
index 8413898..8413898 100644
--- a/tests/emails/legacy/022.bodystructure
+++ b/tests/emails/legacy/022.dovecot.bodystructure
diff --git a/tests/emails/legacy/023.cyrus.body b/tests/emails/legacy/023.cyrus.body
new file mode 100644
index 0000000..745c8af
--- /dev/null
+++ b/tests/emails/legacy/023.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/023.cyrus.bodystructure
new file mode 100644
index 0000000..80e18f7
--- /dev/null
+++ b/tests/emails/legacy/023.cyrus.bodystructure
@@ -0,0 +1,2 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1814 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 804 17 NIL ("ATTACHMENT" ("FILENAME" "farmerandstork.txt")) NIL NIL)("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16 NIL ("ATTACHMENT" ("FILENAME" {19}
+HasenundFrösche.txt)) NIL NIL) "MIXED" ("BOUNDARY" "=====================_716541962==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/023.body b/tests/emails/legacy/023.dovecot.body
index 012af28..012af28 100644
--- a/tests/emails/legacy/023.body
+++ b/tests/emails/legacy/023.dovecot.body
diff --git a/tests/emails/legacy/023.bodystructure b/tests/emails/legacy/023.dovecot.bodystructure
index 552e0e0..552e0e0 100644
--- a/tests/emails/legacy/023.bodystructure
+++ b/tests/emails/legacy/023.dovecot.bodystructure
diff --git a/tests/emails/legacy/024.cyrus.body b/tests/emails/legacy/024.cyrus.body
new file mode 100644
index 0000000..4739bbd
--- /dev/null
+++ b/tests/emails/legacy/024.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/024.cyrus.bodystructure
new file mode 100644
index 0000000..68c3137
--- /dev/null
+++ b/tests/emails/legacy/024.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1239 27 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "2aa48eb6.png") "<4.2.0.58.20000519003735.00a8d7e0@pop.example.com.2>" NIL "BASE64" 1814 NIL ("INLINE" ("FILENAME" "2aa48eb6.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "2aa48ec0.png") "<4.2.0.58.20000519003735.00a8d7e0@pop.example.com.3>" NIL "BASE64" 1990 NIL ("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/024.body b/tests/emails/legacy/024.dovecot.body
index 65506ad..65506ad 100644
--- a/tests/emails/legacy/024.body
+++ b/tests/emails/legacy/024.dovecot.body
diff --git a/tests/emails/legacy/024.bodystructure b/tests/emails/legacy/024.dovecot.bodystructure
index 97c9007..97c9007 100644
--- a/tests/emails/legacy/024.bodystructure
+++ b/tests/emails/legacy/024.dovecot.bodystructure
diff --git a/tests/emails/legacy/025.cyrus.body b/tests/emails/legacy/025.cyrus.body
new file mode 100644
index 0000000..d3467df
--- /dev/null
+++ b/tests/emails/legacy/025.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/025.cyrus.bodystructure
new file mode 100644
index 0000000..e0c5a3b
--- /dev/null
+++ b/tests/emails/legacy/025.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1230 26 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "2aa51367.png") "<4.2.0.58.20000519003809.00a85140@pop.example.com.2>" NIL "BASE64" 1814 NIL ("INLINE" ("FILENAME" "2aa51367.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "2aa51371.png") "<4.2.0.58.20000519003809.00a85140@pop.example.com.3>" NIL "BASE64" 1990 NIL ("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 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1776 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL) "MIXED" ("BOUNDARY" "=====================_715462801==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/025.body b/tests/emails/legacy/025.dovecot.body
index 078fb0c..078fb0c 100644
--- a/tests/emails/legacy/025.body
+++ b/tests/emails/legacy/025.dovecot.body
diff --git a/tests/emails/legacy/025.bodystructure b/tests/emails/legacy/025.dovecot.bodystructure
index fa8f4a1..fa8f4a1 100644
--- a/tests/emails/legacy/025.bodystructure
+++ b/tests/emails/legacy/025.dovecot.bodystructure
diff --git a/tests/emails/legacy/026.cyrus.body b/tests/emails/legacy/026.cyrus.body
new file mode 100644
index 0000000..581acf4
--- /dev/null
+++ b/tests/emails/legacy/026.cyrus.body
@@ -0,0 +1,2 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16)("TEXT" "PLAIN" ("NAME" {19}
+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.cyrus.bodystructure b/tests/emails/legacy/026.cyrus.bodystructure
new file mode 100644
index 0000000..8f4824c
--- /dev/null
+++ b/tests/emails/legacy/026.cyrus.bodystructure
@@ -0,0 +1,3 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 16 NIL NIL NIL NIL)("TEXT" "PLAIN" ("NAME" {19}
+HasenundFrösche.txt "X-MAC-TYPE" "54455854" "X-MAC-CREATOR" "74747874") NIL NIL "X-UUENCODE" 1088 21 NIL ("ATTACHMENT" ("FILENAME" {19}
+HasenundFrösche.txt)) NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 804 17 NIL ("ATTACHMENT" ("FILENAME" "farmerandstork.txt")) NIL NIL) "MIXED" ("BOUNDARY" "=====================_716740438==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/026.body b/tests/emails/legacy/026.dovecot.body
index 6645c7a..6645c7a 100644
--- a/tests/emails/legacy/026.body
+++ b/tests/emails/legacy/026.dovecot.body
diff --git a/tests/emails/legacy/026.bodystructure b/tests/emails/legacy/026.dovecot.bodystructure
index e48b4fc..e48b4fc 100644
--- a/tests/emails/legacy/026.bodystructure
+++ b/tests/emails/legacy/026.dovecot.bodystructure
diff --git a/tests/emails/legacy/027.cyrus.body b/tests/emails/legacy/027.cyrus.body
new file mode 100644
index 0000000..dfccf67
--- /dev/null
+++ b/tests/emails/legacy/027.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/027.cyrus.bodystructure
new file mode 100644
index 0000000..f7d2a82
--- /dev/null
+++ b/tests/emails/legacy/027.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 811 17 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/027.body b/tests/emails/legacy/027.dovecot.body
index 0da3296..0da3296 100644
--- a/tests/emails/legacy/027.body
+++ b/tests/emails/legacy/027.dovecot.body
diff --git a/tests/emails/legacy/027.bodystructure b/tests/emails/legacy/027.dovecot.bodystructure
index 82d4dd4..82d4dd4 100644
--- a/tests/emails/legacy/027.bodystructure
+++ b/tests/emails/legacy/027.dovecot.bodystructure
diff --git a/tests/emails/legacy/028.cyrus.body b/tests/emails/legacy/028.cyrus.body
new file mode 100644
index 0000000..c68e674
--- /dev/null
+++ b/tests/emails/legacy/028.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/028.cyrus.bodystructure
new file mode 100644
index 0000000..b3e95fd
--- /dev/null
+++ b/tests/emails/legacy/028.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 809 20 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1576 36 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "----=_NextPart_001_000D_01BFC038.5A5C8E60") NIL NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") "<823504223@17052000-0f8d>" NIL "BASE64" 1816 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") "<823504223@17052000-0f94>" NIL "BASE64" 1992 NIL 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/028.body b/tests/emails/legacy/028.dovecot.body
index 688decf..688decf 100644
--- a/tests/emails/legacy/028.body
+++ b/tests/emails/legacy/028.dovecot.body
diff --git a/tests/emails/legacy/028.bodystructure b/tests/emails/legacy/028.dovecot.bodystructure
index 8a6e4ad..8a6e4ad 100644
--- a/tests/emails/legacy/028.bodystructure
+++ b/tests/emails/legacy/028.dovecot.bodystructure
diff --git a/tests/emails/legacy/029.cyrus.body b/tests/emails/legacy/029.cyrus.body
new file mode 100644
index 0000000..d271a5f
--- /dev/null
+++ b/tests/emails/legacy/029.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/029.cyrus.bodystructure
new file mode 100644
index 0000000..52b8b60
--- /dev/null
+++ b/tests/emails/legacy/029.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 771 16 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/029.body b/tests/emails/legacy/029.dovecot.body
index 28596c9..28596c9 100644
--- a/tests/emails/legacy/029.body
+++ b/tests/emails/legacy/029.dovecot.body
diff --git a/tests/emails/legacy/029.bodystructure b/tests/emails/legacy/029.dovecot.bodystructure
index 9cc38a7..9cc38a7 100644
--- a/tests/emails/legacy/029.bodystructure
+++ b/tests/emails/legacy/029.dovecot.bodystructure
diff --git a/tests/emails/legacy/030.cyrus.body b/tests/emails/legacy/030.cyrus.body
new file mode 100644
index 0000000..24bcfa5
--- /dev/null
+++ b/tests/emails/legacy/030.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/030.cyrus.bodystructure
new file mode 100644
index 0000000..bf27a8a
--- /dev/null
+++ b/tests/emails/legacy/030.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 767 14 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1780 NIL ("INLINE" ("FILENAME" "greenball.png")) NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii" "NAME" "hareandtoroise.txt") NIL NIL "7BIT" 762 6 NIL ("INLINE" ("FILENAME" "hareandtoroise.txt")) NIL NIL) "MIXED" ("BOUNDARY" "------------0BBC657DDC74A0B8454627FD") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/030.body b/tests/emails/legacy/030.dovecot.body
index 473cd5b..473cd5b 100644
--- a/tests/emails/legacy/030.body
+++ b/tests/emails/legacy/030.dovecot.body
diff --git a/tests/emails/legacy/030.bodystructure b/tests/emails/legacy/030.dovecot.bodystructure
index e1ddae0..e1ddae0 100644
--- a/tests/emails/legacy/030.bodystructure
+++ b/tests/emails/legacy/030.dovecot.bodystructure
diff --git a/tests/emails/legacy/031.cyrus.body b/tests/emails/legacy/031.cyrus.body
new file mode 100644
index 0000000..3ffd90d
--- /dev/null
+++ b/tests/emails/legacy/031.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/031.cyrus.bodystructure
new file mode 100644
index 0000000..776f658
--- /dev/null
+++ b/tests/emails/legacy/031.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "US-ASCII") NIL NIL "7BIT" 41 2 NIL NIL NIL NIL)("APPLICATION" "OCTET-STREAM" ("NAME" "redball.png") "<Pine.LNX.4.21.0005190955480.8452@penguin.example.com>" "A PNG graphic file" "BASE64" 2004 NIL ("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 NIL ("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/031.body b/tests/emails/legacy/031.dovecot.body
index 98472c3..98472c3 100644
--- a/tests/emails/legacy/031.body
+++ b/tests/emails/legacy/031.dovecot.body
diff --git a/tests/emails/legacy/031.bodystructure b/tests/emails/legacy/031.dovecot.bodystructure
index 47db37b..47db37b 100644
--- a/tests/emails/legacy/031.bodystructure
+++ b/tests/emails/legacy/031.dovecot.bodystructure
diff --git a/tests/emails/legacy/032.cyrus.body b/tests/emails/legacy/032.cyrus.body
new file mode 100644
index 0000000..ac45d21
--- /dev/null
+++ b/tests/emails/legacy/032.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/032.cyrus.bodystructure
new file mode 100644
index 0000000..22f1eae
--- /dev/null
+++ b/tests/emails/legacy/032.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 798 21 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "7BIT" 949 17 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "------------D74AE2393FB01D1B284AE257") NIL NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1780 NIL ("INLINE" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL) "MIXED" ("BOUNDARY" "------------C78F594988075E36AE03C243") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/032.body b/tests/emails/legacy/032.dovecot.body
index db3a711..db3a711 100644
--- a/tests/emails/legacy/032.body
+++ b/tests/emails/legacy/032.dovecot.body
diff --git a/tests/emails/legacy/032.bodystructure b/tests/emails/legacy/032.dovecot.bodystructure
index 050b81d..050b81d 100644
--- a/tests/emails/legacy/032.bodystructure
+++ b/tests/emails/legacy/032.dovecot.bodystructure
diff --git a/tests/emails/legacy/033.cyrus.body b/tests/emails/legacy/033.cyrus.body
new file mode 100644
index 0000000..047f893
--- /dev/null
+++ b/tests/emails/legacy/033.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/033.cyrus.bodystructure
new file mode 100644
index 0000000..e2fee8c
--- /dev/null
+++ b/tests/emails/legacy/033.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "QUOTED-PRINTABLE" 804 22 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/033.body b/tests/emails/legacy/033.dovecot.body
index 1635c99..1635c99 100644
--- a/tests/emails/legacy/033.body
+++ b/tests/emails/legacy/033.dovecot.body
diff --git a/tests/emails/legacy/033.bodystructure b/tests/emails/legacy/033.dovecot.bodystructure
index 52e98bc..52e98bc 100644
--- a/tests/emails/legacy/033.bodystructure
+++ b/tests/emails/legacy/033.dovecot.bodystructure
diff --git a/tests/emails/legacy/034.cyrus.body b/tests/emails/legacy/034.cyrus.body
new file mode 100644
index 0000000..5aac5b4
--- /dev/null
+++ b/tests/emails/legacy/034.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/034.cyrus.bodystructure
new file mode 100644
index 0000000..feb93f9
--- /dev/null
+++ b/tests/emails/legacy/034.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "UTF-7") NIL NIL "7BIT" 791 16 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/034.body b/tests/emails/legacy/034.dovecot.body
index f2ca9c8..f2ca9c8 100644
--- a/tests/emails/legacy/034.body
+++ b/tests/emails/legacy/034.dovecot.body
diff --git a/tests/emails/legacy/034.bodystructure b/tests/emails/legacy/034.dovecot.bodystructure
index be973a1..be973a1 100644
--- a/tests/emails/legacy/034.bodystructure
+++ b/tests/emails/legacy/034.dovecot.bodystructure
diff --git a/tests/emails/legacy/035.cyrus.body b/tests/emails/legacy/035.cyrus.body
new file mode 100644
index 0000000..957f71c
--- /dev/null
+++ b/tests/emails/legacy/035.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/035.cyrus.bodystructure
new file mode 100644
index 0000000..c919afa
--- /dev/null
+++ b/tests/emails/legacy/035.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 824 25 NIL NIL NIL NIL)(("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "7BIT" 1122 19 NIL NIL NIL NIL)("IMAGE" "PNG" NIL "<part1.39235FC5.E71D8178@example.com>" NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "C:TEMPnsmailEG.png")) NIL NIL)("IMAGE" "PNG" NIL "<part2.39235FC5.E71D8178@example.com>" NIL "BASE64" 1992 NIL ("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 NIL ("INLINE" ("FILENAME" "redball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1780 NIL ("INLINE" ("FILENAME" "greenball.png")) NIL NIL) "MIXED" ("BOUNDARY" "------------A1E83A41894D3755390B838A") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/035.body b/tests/emails/legacy/035.dovecot.body
index b55102f..b55102f 100644
--- a/tests/emails/legacy/035.body
+++ b/tests/emails/legacy/035.dovecot.body
diff --git a/tests/emails/legacy/035.bodystructure b/tests/emails/legacy/035.dovecot.bodystructure
index 67fba61..67fba61 100644
--- a/tests/emails/legacy/035.bodystructure
+++ b/tests/emails/legacy/035.dovecot.bodystructure
diff --git a/tests/emails/legacy/036.cyrus.body b/tests/emails/legacy/036.cyrus.body
new file mode 100644
index 0000000..f4764fe
--- /dev/null
+++ b/tests/emails/legacy/036.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/036.cyrus.bodystructure
new file mode 100644
index 0000000..9a9252c
--- /dev/null
+++ b/tests/emails/legacy/036.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 813 18 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/036.body b/tests/emails/legacy/036.dovecot.body
index 55bb829..55bb829 100644
--- a/tests/emails/legacy/036.body
+++ b/tests/emails/legacy/036.dovecot.body
diff --git a/tests/emails/legacy/036.bodystructure b/tests/emails/legacy/036.dovecot.bodystructure
index fb0012b..fb0012b 100644
--- a/tests/emails/legacy/036.bodystructure
+++ b/tests/emails/legacy/036.dovecot.bodystructure
diff --git a/tests/emails/legacy/037.cyrus.body b/tests/emails/legacy/037.cyrus.body
new file mode 100644
index 0000000..5ddfae6
--- /dev/null
+++ b/tests/emails/legacy/037.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/037.cyrus.bodystructure
new file mode 100644
index 0000000..78cd620
--- /dev/null
+++ b/tests/emails/legacy/037.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 1 0 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL) "MIXED" ("BOUNDARY" "------------E7889DDF0F75D34163841C59") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/037.body b/tests/emails/legacy/037.dovecot.body
index 7d7639d..7d7639d 100644
--- a/tests/emails/legacy/037.body
+++ b/tests/emails/legacy/037.dovecot.body
diff --git a/tests/emails/legacy/037.bodystructure b/tests/emails/legacy/037.dovecot.bodystructure
index 6527c17..6527c17 100644
--- a/tests/emails/legacy/037.bodystructure
+++ b/tests/emails/legacy/037.dovecot.bodystructure
diff --git a/tests/emails/legacy/038.cyrus.body b/tests/emails/legacy/038.cyrus.body
new file mode 100644
index 0000000..40ca633
--- /dev/null
+++ b/tests/emails/legacy/038.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/038.cyrus.bodystructure
new file mode 100644
index 0000000..371b393
--- /dev/null
+++ b/tests/emails/legacy/038.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 762 7 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/038.body b/tests/emails/legacy/038.dovecot.body
index 62e836c..62e836c 100644
--- a/tests/emails/legacy/038.body
+++ b/tests/emails/legacy/038.dovecot.body
diff --git a/tests/emails/legacy/038.bodystructure b/tests/emails/legacy/038.dovecot.bodystructure
index a2f5552..a2f5552 100644
--- a/tests/emails/legacy/038.bodystructure
+++ b/tests/emails/legacy/038.dovecot.bodystructure
diff --git a/tests/emails/legacy/039.cyrus.body b/tests/emails/legacy/039.cyrus.body
new file mode 100644
index 0000000..b37120c
--- /dev/null
+++ b/tests/emails/legacy/039.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/039.cyrus.bodystructure
new file mode 100644
index 0000000..db87b0a
--- /dev/null
+++ b/tests/emails/legacy/039.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "7BIT" 1134 17 NIL NIL NIL NIL)("IMAGE" "PNG" NIL "<part1.39236103.1B697A54@example.com>" NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "C:TEMPnsmailV0.png")) NIL NIL)("IMAGE" "PNG" NIL "<part2.39236103.1B697A54@example.com>" NIL "BASE64" 1992 NIL ("INLINE" ("FILENAME" "C:TEMPnsmailNM.png")) NIL NIL) "RELATED" ("BOUNDARY" "------------8E6A06810565BCAB5E1F7D97") NIL NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1780 NIL ("INLINE" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL) "MIXED" ("BOUNDARY" "------------B7133A01A6B323BF00DBC9A7") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/039.body b/tests/emails/legacy/039.dovecot.body
index 1c6b06e..1c6b06e 100644
--- a/tests/emails/legacy/039.body
+++ b/tests/emails/legacy/039.dovecot.body
diff --git a/tests/emails/legacy/039.bodystructure b/tests/emails/legacy/039.dovecot.bodystructure
index a3b5678..a3b5678 100644
--- a/tests/emails/legacy/039.bodystructure
+++ b/tests/emails/legacy/039.dovecot.bodystructure
diff --git a/tests/emails/legacy/040.cyrus.body b/tests/emails/legacy/040.cyrus.body
new file mode 100644
index 0000000..b6fcde3
--- /dev/null
+++ b/tests/emails/legacy/040.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/040.cyrus.bodystructure
new file mode 100644
index 0000000..f1a5f23
--- /dev/null
+++ b/tests/emails/legacy/040.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 808 18 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/040.body b/tests/emails/legacy/040.dovecot.body
index 9fc090b..9fc090b 100644
--- a/tests/emails/legacy/040.body
+++ b/tests/emails/legacy/040.dovecot.body
diff --git a/tests/emails/legacy/040.bodystructure b/tests/emails/legacy/040.dovecot.bodystructure
index 63104bd..63104bd 100644
--- a/tests/emails/legacy/040.bodystructure
+++ b/tests/emails/legacy/040.dovecot.bodystructure
diff --git a/tests/emails/legacy/041.cyrus.body b/tests/emails/legacy/041.cyrus.body
new file mode 100644
index 0000000..abe34cb
--- /dev/null
+++ b/tests/emails/legacy/041.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/041.cyrus.bodystructure
new file mode 100644
index 0000000..0a1dec2
--- /dev/null
+++ b/tests/emails/legacy/041.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "US-ASCII") NIL NIL "7BIT" 0 0 NIL NIL NIL NIL)("APPLICATION" "OCTET-STREAM" ("NAME" "redball.png") "<Pine.LNX.4.21.0005191023160.8452@penguin.example.com>" "red ball" "BASE64" 2004 NIL ("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/041.body b/tests/emails/legacy/041.dovecot.body
index 9e72b78..9e72b78 100644
--- a/tests/emails/legacy/041.body
+++ b/tests/emails/legacy/041.dovecot.body
diff --git a/tests/emails/legacy/041.bodystructure b/tests/emails/legacy/041.dovecot.bodystructure
index f830770..f830770 100644
--- a/tests/emails/legacy/041.bodystructure
+++ b/tests/emails/legacy/041.dovecot.bodystructure
diff --git a/tests/emails/legacy/042.cyrus.body b/tests/emails/legacy/042.cyrus.body
new file mode 100644
index 0000000..1d05858
--- /dev/null
+++ b/tests/emails/legacy/042.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/042.cyrus.bodystructure
new file mode 100644
index 0000000..05350a0
--- /dev/null
+++ b/tests/emails/legacy/042.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 767 14 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii" "NAME" "farmerandstork.txt") NIL NIL "7BIT" 804 17 NIL ("INLINE" ("FILENAME" "farmerandstork.txt")) NIL NIL) "MIXED" ("BOUNDARY" "------------77060D866A66DC8D0921E051") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/042.body b/tests/emails/legacy/042.dovecot.body
index ee51cd6..ee51cd6 100644
--- a/tests/emails/legacy/042.body
+++ b/tests/emails/legacy/042.dovecot.body
diff --git a/tests/emails/legacy/042.bodystructure b/tests/emails/legacy/042.dovecot.bodystructure
index 8e7c589..8e7c589 100644
--- a/tests/emails/legacy/042.bodystructure
+++ b/tests/emails/legacy/042.dovecot.bodystructure
diff --git a/tests/emails/legacy/043.cyrus.body b/tests/emails/legacy/043.cyrus.body
new file mode 100644
index 0000000..ad3cb82
--- /dev/null
+++ b/tests/emails/legacy/043.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/043.cyrus.bodystructure
new file mode 100644
index 0000000..1c9731e
--- /dev/null
+++ b/tests/emails/legacy/043.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 798 21 NIL NIL NIL NIL)("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "7BIT" 949 17 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "------------9D454F23DA86BCD63FA3805F") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/043.body b/tests/emails/legacy/043.dovecot.body
index ab0b252..ab0b252 100644
--- a/tests/emails/legacy/043.body
+++ b/tests/emails/legacy/043.dovecot.body
diff --git a/tests/emails/legacy/043.bodystructure b/tests/emails/legacy/043.dovecot.bodystructure
index 39e4133..39e4133 100644
--- a/tests/emails/legacy/043.bodystructure
+++ b/tests/emails/legacy/043.dovecot.bodystructure
diff --git a/tests/emails/legacy/044.cyrus.body b/tests/emails/legacy/044.cyrus.body
new file mode 100644
index 0000000..4104c04
--- /dev/null
+++ b/tests/emails/legacy/044.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/044.cyrus.bodystructure
new file mode 100644
index 0000000..863a826
--- /dev/null
+++ b/tests/emails/legacy/044.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 798 21 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "BASE64" 1992 NIL ("INLINE" ("FILENAME" "redball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1780 NIL ("INLINE" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "BASE64" 1816 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL) "MIXED" ("BOUNDARY" "------------A1FCDEE154E03D875E5D6779") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/044.body b/tests/emails/legacy/044.dovecot.body
index 0c08240..0c08240 100644
--- a/tests/emails/legacy/044.body
+++ b/tests/emails/legacy/044.dovecot.body
diff --git a/tests/emails/legacy/044.bodystructure b/tests/emails/legacy/044.dovecot.bodystructure
index 69ac1d5..69ac1d5 100644
--- a/tests/emails/legacy/044.bodystructure
+++ b/tests/emails/legacy/044.dovecot.bodystructure
diff --git a/tests/emails/legacy/045.cyrus.body b/tests/emails/legacy/045.cyrus.body
new file mode 100644
index 0000000..5a72495
--- /dev/null
+++ b/tests/emails/legacy/045.cyrus.body
@@ -0,0 +1,2 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "US-ASCII") NIL NIL "7BIT" 0 0)("TEXT" "PLAIN" ("CHARSET" "iso-8859-1" "NAME*" {33}
+iso-8859-1''HasenundFr%F6sche.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.cyrus.bodystructure b/tests/emails/legacy/045.cyrus.bodystructure
new file mode 100644
index 0000000..3fc97e9
--- /dev/null
+++ b/tests/emails/legacy/045.cyrus.bodystructure
@@ -0,0 +1,3 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "US-ASCII") NIL NIL "7BIT" 0 0 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "iso-8859-1" "NAME*" {33}
+iso-8859-1''HasenundFr%F6sche.txt) "<Pine.LNX.4.21.0005191026120.8452@penguin.example.com>" "Short story in German" "BASE64" 1040 16 NIL ("ATTACHMENT" ("FILENAME*" {33}
+iso-8859-1''HasenundFr%F6sche.txt)) NIL NIL) "MIXED" ("BOUNDARY" "-1463757054-891160829-958746372=:8452") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/045.body b/tests/emails/legacy/045.dovecot.body
index 9e0f9ff..9e0f9ff 100644
--- a/tests/emails/legacy/045.body
+++ b/tests/emails/legacy/045.dovecot.body
diff --git a/tests/emails/legacy/045.bodystructure b/tests/emails/legacy/045.dovecot.bodystructure
index cdb1110..cdb1110 100644
--- a/tests/emails/legacy/045.bodystructure
+++ b/tests/emails/legacy/045.dovecot.bodystructure
diff --git a/tests/emails/legacy/046.cyrus.body b/tests/emails/legacy/046.cyrus.body
new file mode 100644
index 0000000..f394af0
--- /dev/null
+++ b/tests/emails/legacy/046.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/046.cyrus.bodystructure
new file mode 100644
index 0000000..3360448
--- /dev/null
+++ b/tests/emails/legacy/046.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 800 22 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/046.body b/tests/emails/legacy/046.dovecot.body
index 10cd9db..10cd9db 100644
--- a/tests/emails/legacy/046.body
+++ b/tests/emails/legacy/046.dovecot.body
diff --git a/tests/emails/legacy/046.bodystructure b/tests/emails/legacy/046.dovecot.bodystructure
index c2c2f87..c2c2f87 100644
--- a/tests/emails/legacy/046.bodystructure
+++ b/tests/emails/legacy/046.dovecot.bodystructure
diff --git a/tests/emails/legacy/047.cyrus.body b/tests/emails/legacy/047.cyrus.body
new file mode 100644
index 0000000..7483bd6
--- /dev/null
+++ b/tests/emails/legacy/047.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 767 14)("TEXT" "PLAIN" ("CHARSET" "iso-8859-1" "NAME" "=?iso-8859-1?Q?HasenundFr=F6sche=2Etxt?=") NIL NIL "QUOTED-PRINTABLE" 812 19) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/legacy/047.cyrus.bodystructure b/tests/emails/legacy/047.cyrus.bodystructure
new file mode 100644
index 0000000..6cb2b65
--- /dev/null
+++ b/tests/emails/legacy/047.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 767 14 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "iso-8859-1" "NAME" "=?iso-8859-1?Q?HasenundFr=F6sche=2Etxt?=") NIL NIL "QUOTED-PRINTABLE" 812 19 NIL ("INLINE" ("FILENAME" "=?iso-8859-1?Q?HasenundFr=F6sche=2Etxt?=")) NIL NIL) "MIXED" ("BOUNDARY" "------------CA611088711119FBDB3473B4") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/047.body b/tests/emails/legacy/047.dovecot.body
index 742c81d..742c81d 100644
--- a/tests/emails/legacy/047.body
+++ b/tests/emails/legacy/047.dovecot.body
diff --git a/tests/emails/legacy/047.bodystructure b/tests/emails/legacy/047.dovecot.bodystructure
index d2bfa0d..d2bfa0d 100644
--- a/tests/emails/legacy/047.bodystructure
+++ b/tests/emails/legacy/047.dovecot.bodystructure
diff --git a/tests/emails/legacy/048.cyrus.body b/tests/emails/legacy/048.cyrus.body
new file mode 100644
index 0000000..547a351
--- /dev/null
+++ b/tests/emails/legacy/048.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/048.cyrus.bodystructure
new file mode 100644
index 0000000..eb929d3
--- /dev/null
+++ b/tests/emails/legacy/048.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 767 14 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "redball.png") NIL NIL "X-UUENCODE" 2067 NIL ("INLINE" ("FILENAME" "redball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "X-UUENCODE" 1849 NIL ("INLINE" ("FILENAME" "greenball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "blueball.png") NIL NIL "X-UUENCODE" 1887 NIL ("INLINE" ("FILENAME" "blueball.png")) NIL NIL) "MIXED" ("BOUNDARY" "------------177483472E7788F4AD46AB1A") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/048.body b/tests/emails/legacy/048.dovecot.body
index cd66b75..cd66b75 100644
--- a/tests/emails/legacy/048.body
+++ b/tests/emails/legacy/048.dovecot.body
diff --git a/tests/emails/legacy/048.bodystructure b/tests/emails/legacy/048.dovecot.bodystructure
index b53f277..b53f277 100644
--- a/tests/emails/legacy/048.bodystructure
+++ b/tests/emails/legacy/048.dovecot.bodystructure
diff --git a/tests/emails/legacy/049.cyrus.body b/tests/emails/legacy/049.cyrus.body
new file mode 100644
index 0000000..bad2ba0
--- /dev/null
+++ b/tests/emails/legacy/049.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/049.cyrus.bodystructure
new file mode 100644
index 0000000..82a9e35
--- /dev/null
+++ b/tests/emails/legacy/049.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 6585 121 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/049.body b/tests/emails/legacy/049.dovecot.body
index 37efcfd..37efcfd 100644
--- a/tests/emails/legacy/049.body
+++ b/tests/emails/legacy/049.dovecot.body
diff --git a/tests/emails/legacy/049.bodystructure b/tests/emails/legacy/049.dovecot.bodystructure
index ec644fa..ec644fa 100644
--- a/tests/emails/legacy/049.bodystructure
+++ b/tests/emails/legacy/049.dovecot.bodystructure
diff --git a/tests/emails/legacy/050.cyrus.body b/tests/emails/legacy/050.cyrus.body
new file mode 100644
index 0000000..65f41d2
--- /dev/null
+++ b/tests/emails/legacy/050.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/050.cyrus.bodystructure
new file mode 100644
index 0000000..3303530
--- /dev/null
+++ b/tests/emails/legacy/050.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "HTML" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 1239 27 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "2aa658b6.png") "<4.2.0.58.20000519003934.00a866f0@pop.example.com.2>" NIL "BASE64" 1814 NIL ("INLINE" ("FILENAME" "2aa658b6.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "2aa658c0.png") "<4.2.0.58.20000519003934.00a866f0@pop.example.com.3>" NIL "BASE64" 1990 NIL ("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/050.body b/tests/emails/legacy/050.dovecot.body
index 141bcd4..141bcd4 100644
--- a/tests/emails/legacy/050.body
+++ b/tests/emails/legacy/050.dovecot.body
diff --git a/tests/emails/legacy/050.bodystructure b/tests/emails/legacy/050.dovecot.bodystructure
index 0d567d4..0d567d4 100644
--- a/tests/emails/legacy/050.bodystructure
+++ b/tests/emails/legacy/050.dovecot.bodystructure
diff --git a/tests/emails/legacy/051.cyrus.body b/tests/emails/legacy/051.cyrus.body
new file mode 100644
index 0000000..0f93408
--- /dev/null
+++ b/tests/emails/legacy/051.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/051.cyrus.bodystructure
new file mode 100644
index 0000000..ea31a10
--- /dev/null
+++ b/tests/emails/legacy/051.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ((("TEXT" "PLAIN" ("CHARSET" "iso-8859-1") NIL NIL "QUOTED-PRINTABLE" 833 16 NIL NIL NIL NIL)("IMAGE" "PNG" ("NAME" "2aa5e03a.png") "<4.2.0.58.20000519003903.00a859b0@pop.example.com.2>" NIL "BASE64" 1814 NIL ("INLINE" ("FILENAME" "2aa5e03a.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "2aa5e044.png") "<4.2.0.58.20000519003903.00a859b0@pop.example.com.3>" NIL "BASE64" 1990 NIL ("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 NIL ("ATTACHMENT" ("FILENAME" "blueball.png")) NIL NIL)("IMAGE" "PNG" ("NAME" "greenball.png") NIL NIL "BASE64" 1776 NIL ("ATTACHMENT" ("FILENAME" "greenball.png")) NIL NIL) "MIXED" ("BOUNDARY" "=====================_715515186==_") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/051.body b/tests/emails/legacy/051.dovecot.body
index 2998597..2998597 100644
--- a/tests/emails/legacy/051.body
+++ b/tests/emails/legacy/051.dovecot.body
diff --git a/tests/emails/legacy/051.bodystructure b/tests/emails/legacy/051.dovecot.bodystructure
index 25e1c70..25e1c70 100644
--- a/tests/emails/legacy/051.bodystructure
+++ b/tests/emails/legacy/051.dovecot.bodystructure
diff --git a/tests/emails/legacy/052.cyrus.body b/tests/emails/legacy/052.cyrus.body
new file mode 100644
index 0000000..7bbb285
--- /dev/null
+++ b/tests/emails/legacy/052.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/052.cyrus.bodystructure
new file mode 100644
index 0000000..8343867
--- /dev/null
+++ b/tests/emails/legacy/052.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 754 17 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/052.body b/tests/emails/legacy/052.dovecot.body
index 1113cb1..1113cb1 100644
--- a/tests/emails/legacy/052.body
+++ b/tests/emails/legacy/052.dovecot.body
diff --git a/tests/emails/legacy/052.bodystructure b/tests/emails/legacy/052.dovecot.bodystructure
index 9059d11..9059d11 100644
--- a/tests/emails/legacy/052.bodystructure
+++ b/tests/emails/legacy/052.dovecot.bodystructure
diff --git a/tests/emails/legacy/053.cyrus.body b/tests/emails/legacy/053.cyrus.body
new file mode 100644
index 0000000..51a9bbe
--- /dev/null
+++ b/tests/emails/legacy/053.cyrus.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.cyrus.bodystructure b/tests/emails/legacy/053.cyrus.bodystructure
new file mode 100644
index 0000000..770b2e1
--- /dev/null
+++ b/tests/emails/legacy/053.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE ("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "QUOTED-PRINTABLE" 863 18 NIL NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/legacy/053.body b/tests/emails/legacy/053.dovecot.body
index 337a7e2..337a7e2 100644
--- a/tests/emails/legacy/053.body
+++ b/tests/emails/legacy/053.dovecot.body
diff --git a/tests/emails/legacy/053.bodystructure b/tests/emails/legacy/053.dovecot.bodystructure
index 2728f20..2728f20 100644
--- a/tests/emails/legacy/053.bodystructure
+++ b/tests/emails/legacy/053.dovecot.bodystructure
diff --git a/tests/emails/rfc/000.cyrus.body b/tests/emails/rfc/000.cyrus.body
new file mode 100644
index 0000000..b41599c
--- /dev/null
+++ b/tests/emails/rfc/000.cyrus.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)(("AUDIO" "BASIC" NIL NIL NIL "BASE64" 87)("IMAGE" "JPEG" NIL NIL NIL "BASE64" 45) "PARALLEL")("TEXT" "ENRICHED" NIL NIL NIL "7BIT" 145 5)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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) 7) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/rfc/000.cyrus.bodystructure b/tests/emails/rfc/000.cyrus.bodystructure
new file mode 100644
index 0000000..3fb98ba
--- /dev/null
+++ b/tests/emails/rfc/000.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 269 7 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "US-ASCII") NIL NIL "7BIT" 114 3 NIL NIL NIL NIL)(("AUDIO" "BASIC" NIL NIL NIL "BASE64" 87 NIL NIL NIL NIL)("IMAGE" "JPEG" NIL NIL NIL "BASE64" 45 NIL NIL NIL NIL) "PARALLEL" ("BOUNDARY" "unique-boundary-2") NIL NIL NIL)("TEXT" "ENRICHED" NIL NIL NIL "7BIT" 145 5 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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 NIL NIL NIL NIL) 7 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "unique-boundary-1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/000.body b/tests/emails/rfc/000.dovecot.body
index 6830fc9..6830fc9 100644
--- a/tests/emails/rfc/000.body
+++ b/tests/emails/rfc/000.dovecot.body
diff --git a/tests/emails/rfc/000.bodystructure b/tests/emails/rfc/000.dovecot.bodystructure
index 0e6c4df..0e6c4df 100644
--- a/tests/emails/rfc/000.bodystructure
+++ b/tests/emails/rfc/000.dovecot.bodystructure
diff --git a/tests/emails/rfc/001.cyrus.body b/tests/emails/rfc/001.cyrus.body
new file mode 100644
index 0000000..258ff1c
--- /dev/null
+++ b/tests/emails/rfc/001.cyrus.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 "7BIT" 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 "7BIT" 81)("MESSAGE" "EXTERNAL-BODY" ("EXPIRATION" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL "7BIT" 101) "ALTERNATIVE")) \ No newline at end of file
diff --git a/tests/emails/rfc/001.cyrus.bodystructure b/tests/emails/rfc/001.cyrus.bodystructure
new file mode 100644
index 0000000..e89332c
--- /dev/null
+++ b/tests/emails/rfc/001.cyrus.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 "7BIT" 81 NIL 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 "7BIT" 81 NIL NIL NIL NIL)("MESSAGE" "EXTERNAL-BODY" ("EXPIRATION" "Fri, 14 Jun 1991 19:13:14 -0400 (EDT)") NIL NIL "7BIT" 101 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "42") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/001.body b/tests/emails/rfc/001.dovecot.body
index 544387a..544387a 100644
--- a/tests/emails/rfc/001.body
+++ b/tests/emails/rfc/001.dovecot.body
diff --git a/tests/emails/rfc/001.bodystructure b/tests/emails/rfc/001.dovecot.bodystructure
index f5c0c84..f5c0c84 100644
--- a/tests/emails/rfc/001.bodystructure
+++ b/tests/emails/rfc/001.dovecot.bodystructure
diff --git a/tests/emails/rfc/002.cyrus.body b/tests/emails/rfc/002.cyrus.body
new file mode 100644
index 0000000..e544aff
--- /dev/null
+++ b/tests/emails/rfc/002.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 66 5)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 2026 ("Mon, 13 Aug 1998 17:42:41 +1000" "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" 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") 47) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/rfc/002.cyrus.bodystructure b/tests/emails/rfc/002.cyrus.bodystructure
new file mode 100644
index 0000000..a7e2b00
--- /dev/null
+++ b/tests/emails/rfc/002.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 66 5 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 2026 ("Mon, 13 Aug 1998 17:42:41 +1000" "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" NIL "vice-president" "whitehouse.gov")) NIL NIL NIL "<199804130742.RAA20366@mai1host.whitehouse.gov>") (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 367 12 NIL NIL NIL NIL)("IMAGE" "GIF" ("NAME" "map_of_Argentina.gif") NIL NIL "BASE64" 394 NIL ("INLINE" ("FI1ENAME" "map_of_Argentina.gif")) NIL NIL) "MIXED" ("BOUNDARY" "DC8------------DC8638F443D87A7F0726DEF7") NIL NIL NIL) 47 NIL ("INLINE" NIL) NIL NIL) "MIXED" ("BOUNDARY" "D7F------------D7FD5A0B8AB9C65CCDBFA872") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/002.body b/tests/emails/rfc/002.dovecot.body
index 00c8986..00c8986 100644
--- a/tests/emails/rfc/002.body
+++ b/tests/emails/rfc/002.dovecot.body
diff --git a/tests/emails/rfc/002.bodystructure b/tests/emails/rfc/002.dovecot.bodystructure
index ee41c1d..ee41c1d 100644
--- a/tests/emails/rfc/002.bodystructure
+++ b/tests/emails/rfc/002.dovecot.bodystructure
diff --git a/tests/emails/rfc/003.cyrus.body b/tests/emails/rfc/003.cyrus.body
new file mode 100644
index 0000000..62c9351
--- /dev/null
+++ b/tests/emails/rfc/003.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 49 1)("TEXT" "ENRICHED" NIL NIL NIL "7BIT" 71 2)("APPLICATION" "X-WHATEVER" NIL NIL NIL "7BIT" 52) "ALTERNATIVE")) \ No newline at end of file
diff --git a/tests/emails/rfc/003.cyrus.bodystructure b/tests/emails/rfc/003.cyrus.bodystructure
new file mode 100644
index 0000000..fa4b044
--- /dev/null
+++ b/tests/emails/rfc/003.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 49 1 NIL NIL NIL NIL)("TEXT" "ENRICHED" NIL NIL NIL "7BIT" 71 2 NIL NIL NIL NIL)("APPLICATION" "X-WHATEVER" NIL NIL NIL "7BIT" 52 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "boundary42") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/003.body b/tests/emails/rfc/003.dovecot.body
index 05005ea..05005ea 100644
--- a/tests/emails/rfc/003.body
+++ b/tests/emails/rfc/003.dovecot.body
diff --git a/tests/emails/rfc/003.bodystructure b/tests/emails/rfc/003.dovecot.bodystructure
index 507566b..507566b 100644
--- a/tests/emails/rfc/003.bodystructure
+++ b/tests/emails/rfc/003.dovecot.bodystructure
diff --git a/tests/emails/rfc/004.cyrus.body b/tests/emails/rfc/004.cyrus.body
new file mode 100644
index 0000000..126e2f2
--- /dev/null
+++ b/tests/emails/rfc/004.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 46 1)(("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 105 ("Fri, 26 Mar 1993 11:13:32 +0200" "my opinion" ((NIL NIL "someone-else" "unspecified-domain")) ((NIL NIL "someone-else" "unspecified-domain")) ((NIL NIL "someone-else" "unspecified-domain")) NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 23 1) 5)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 130 ("Fri, 26 Mar 1993 10:07:13 -0500" "my different opinion" ((NIL NIL "someone-else-again" "unspecified-domain")) ((NIL NIL "someone-else-again" "unspecified-domain")) ((NIL NIL "someone-else-again" "unspecified-domain")) NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 32 1) 5) "DIGEST") "MIXED")) \ No newline at end of file
diff --git a/tests/emails/rfc/004.cyrus.bodystructure b/tests/emails/rfc/004.cyrus.bodystructure
new file mode 100644
index 0000000..dbfdcb5
--- /dev/null
+++ b/tests/emails/rfc/004.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 46 1 NIL NIL NIL NIL)(("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 105 ("Fri, 26 Mar 1993 11:13:32 +0200" "my opinion" ((NIL NIL "someone-else" "unspecified-domain")) ((NIL NIL "someone-else" "unspecified-domain")) ((NIL NIL "someone-else" "unspecified-domain")) NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 23 1 NIL NIL NIL NIL) 5 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 130 ("Fri, 26 Mar 1993 10:07:13 -0500" "my different opinion" ((NIL NIL "someone-else-again" "unspecified-domain")) ((NIL NIL "someone-else-again" "unspecified-domain")) ((NIL NIL "someone-else-again" "unspecified-domain")) NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 32 1 NIL NIL NIL NIL) 5 NIL 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/004.body b/tests/emails/rfc/004.dovecot.body
index 3745fbf..3745fbf 100644
--- a/tests/emails/rfc/004.body
+++ b/tests/emails/rfc/004.dovecot.body
diff --git a/tests/emails/rfc/004.bodystructure b/tests/emails/rfc/004.dovecot.bodystructure
index d6ded58..d6ded58 100644
--- a/tests/emails/rfc/004.bodystructure
+++ b/tests/emails/rfc/004.dovecot.bodystructure
diff --git a/tests/emails/rfc/005.cyrus.body b/tests/emails/rfc/005.cyrus.body
new file mode 100644
index 0000000..c52e4bb
--- /dev/null
+++ b/tests/emails/rfc/005.cyrus.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.cyrus.bodystructure b/tests/emails/rfc/005.cyrus.bodystructure
new file mode 100644
index 0000000..aaf544e
--- /dev/null
+++ b/tests/emails/rfc/005.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 80 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 78 2 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "simple boundary") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/005.body b/tests/emails/rfc/005.dovecot.body
index 3394c76..3394c76 100644
--- a/tests/emails/rfc/005.body
+++ b/tests/emails/rfc/005.dovecot.body
diff --git a/tests/emails/rfc/005.bodystructure b/tests/emails/rfc/005.dovecot.bodystructure
index 1b8f768..1b8f768 100644
--- a/tests/emails/rfc/005.bodystructure
+++ b/tests/emails/rfc/005.dovecot.bodystructure
diff --git a/tests/emails/rfc/006.cyrus.body b/tests/emails/rfc/006.cyrus.body
new file mode 100644
index 0000000..57aae13
--- /dev/null
+++ b/tests/emails/rfc/006.cyrus.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.cyrus.bodystructure b/tests/emails/rfc/006.cyrus.bodystructure
new file mode 100644
index 0000000..48a5094
--- /dev/null
+++ b/tests/emails/rfc/006.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "QUOTED-PRINTABLE" 89 2 NIL ("INLINE" NIL) NIL NIL)("TEXT" "HTML" ("CHARSET" "utf-8") NIL NIL "QUOTED-PRINTABLE" 95 2 NIL ("INLINE" NIL) NIL NIL) "ALTERNATIVE" ("BOUNDARY" "boundary-string") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/006.body b/tests/emails/rfc/006.dovecot.body
index ecccbf0..ecccbf0 100644
--- a/tests/emails/rfc/006.body
+++ b/tests/emails/rfc/006.dovecot.body
diff --git a/tests/emails/rfc/006.bodystructure b/tests/emails/rfc/006.dovecot.bodystructure
index 97849bb..97849bb 100644
--- a/tests/emails/rfc/006.bodystructure
+++ b/tests/emails/rfc/006.dovecot.bodystructure
diff --git a/tests/emails/rfc/007.cyrus.body b/tests/emails/rfc/007.cyrus.body
new file mode 100644
index 0000000..ae0e2a9
--- /dev/null
+++ b/tests/emails/rfc/007.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0)(((("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0)("IMAGE" "JPEG" NIL NIL NIL "7BIT" 1)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0) "MIXED")(("TEXT" "HTML" NIL NIL NIL "7BIT" 14 0)("IMAGE" "JPEG" NIL NIL NIL "7BIT" 1) "RELATED") "ALTERNATIVE")("IMAGE" "JPEG" NIL NIL NIL "7BIT" 1)("APPLICATION" "X-EXCEL" NIL NIL NIL "7BIT" 1)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 15 (NIL "J" NIL NIL NIL NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 1 0) 2) "MIXED")("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/rfc/007.cyrus.bodystructure b/tests/emails/rfc/007.cyrus.bodystructure
new file mode 100644
index 0000000..a2293d0
--- /dev/null
+++ b/tests/emails/rfc/007.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0 NIL ("INLINE" NIL) NIL NIL)(((("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0 NIL ("INLINE" NIL) NIL NIL)("IMAGE" "JPEG" NIL NIL NIL "7BIT" 1 NIL ("INLINE" NIL) NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0 NIL ("INLINE" NIL) NIL NIL) "MIXED" ("BOUNDARY" "4") NIL NIL NIL)(("TEXT" "HTML" NIL NIL NIL "7BIT" 14 0 NIL NIL NIL NIL)("IMAGE" "JPEG" NIL NIL NIL "7BIT" 1 NIL NIL NIL NIL) "RELATED" ("BOUNDARY" "5") NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "3") NIL NIL NIL)("IMAGE" "JPEG" NIL NIL NIL "7BIT" 1 NIL ("ATTACHMENT" NIL) NIL NIL)("APPLICATION" "X-EXCEL" NIL NIL NIL "7BIT" 1 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 15 (NIL "J" NIL NIL NIL NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 1 0 NIL NIL NIL NIL) 2 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "2") NIL NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 1 0 NIL ("INLINE" NIL) NIL NIL) "MIXED" ("BOUNDARY" "1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/007.body b/tests/emails/rfc/007.dovecot.body
index 5d7f252..5d7f252 100644
--- a/tests/emails/rfc/007.body
+++ b/tests/emails/rfc/007.dovecot.body
diff --git a/tests/emails/rfc/007.bodystructure b/tests/emails/rfc/007.dovecot.bodystructure
index 0cd8900..0cd8900 100644
--- a/tests/emails/rfc/007.bodystructure
+++ b/tests/emails/rfc/007.dovecot.bodystructure
diff --git a/tests/emails/rfc/008.cyrus.body b/tests/emails/rfc/008.cyrus.body
new file mode 100644
index 0000000..ebe7492
--- /dev/null
+++ b/tests/emails/rfc/008.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "7BIT" 54 0)("MESSAGE" "RFC822" NIL NIL NIL "BASE64" 1194 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 0 0) 15) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/rfc/008.cyrus.bodystructure b/tests/emails/rfc/008.cyrus.bodystructure
new file mode 100644
index 0000000..275e6a1
--- /dev/null
+++ b/tests/emails/rfc/008.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "7BIT" 54 0 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "BASE64" 1194 (NIL NIL NIL NIL NIL NIL NIL NIL NIL NIL) ("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 0 0 NIL NIL NIL NIL) 15 NIL ("ATTACHMENT" ("FILENAME" "attached_email.eml")) NIL NIL) "MIXED" ("BOUNDARY" "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/rfc/008.body b/tests/emails/rfc/008.dovecot.body
index d11beef..d11beef 100644
--- a/tests/emails/rfc/008.body
+++ b/tests/emails/rfc/008.dovecot.body
diff --git a/tests/emails/rfc/008.bodystructure b/tests/emails/rfc/008.dovecot.bodystructure
index 5078342..5078342 100644
--- a/tests/emails/rfc/008.bodystructure
+++ b/tests/emails/rfc/008.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/000.cyrus.body b/tests/emails/thirdparty/000.cyrus.body
new file mode 100644
index 0000000..0e606d3
--- /dev/null
+++ b/tests/emails/thirdparty/000.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" NIL NIL NIL "BASE64" 224 2)("TEXT" "PLAIN" NIL NIL NIL "BASE64" 4 0) "ALTERNATIVE")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/000.cyrus.bodystructure b/tests/emails/thirdparty/000.cyrus.bodystructure
new file mode 100644
index 0000000..0323600
--- /dev/null
+++ b/tests/emails/thirdparty/000.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" NIL NIL NIL "BASE64" 224 2 NIL NIL NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "BASE64" 4 0 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "bound") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/000.body b/tests/emails/thirdparty/000.dovecot.body
index b237a3e..b237a3e 100644
--- a/tests/emails/thirdparty/000.body
+++ b/tests/emails/thirdparty/000.dovecot.body
diff --git a/tests/emails/thirdparty/000.bodystructure b/tests/emails/thirdparty/000.dovecot.bodystructure
index f15bc72..f15bc72 100644
--- a/tests/emails/thirdparty/000.bodystructure
+++ b/tests/emails/thirdparty/000.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/001.cyrus.body b/tests/emails/thirdparty/001.cyrus.body
new file mode 100644
index 0000000..c5c67d9
--- /dev/null
+++ b/tests/emails/thirdparty/001.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 224 2)("TEXT" "PLAIN" NIL NIL NIL "BINARY" 4 0)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 13 1) "ALTERNATIVE")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/001.cyrus.bodystructure b/tests/emails/thirdparty/001.cyrus.bodystructure
new file mode 100644
index 0000000..ae88145
--- /dev/null
+++ b/tests/emails/thirdparty/001.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 224 2 NIL NIL NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "BINARY" 4 0 NIL NIL NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 13 1 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "bound") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/001.body b/tests/emails/thirdparty/001.dovecot.body
index 7065154..7065154 100644
--- a/tests/emails/thirdparty/001.body
+++ b/tests/emails/thirdparty/001.dovecot.body
diff --git a/tests/emails/thirdparty/001.bodystructure b/tests/emails/thirdparty/001.dovecot.bodystructure
index 0b9642c..0b9642c 100644
--- a/tests/emails/thirdparty/001.bodystructure
+++ b/tests/emails/thirdparty/001.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/002.cyrus.body b/tests/emails/thirdparty/002.cyrus.body
new file mode 100644
index 0000000..58b4bd3
--- /dev/null
+++ b/tests/emails/thirdparty/002.cyrus.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.cyrus.bodystructure b/tests/emails/thirdparty/002.cyrus.bodystructure
new file mode 100644
index 0000000..18586ff
--- /dev/null
+++ b/tests/emails/thirdparty/002.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "QUOTED-PRINTABLE" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "BASE64" 28 0 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "utf-8") NIL NIL "BASE64" 8 0 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "foo") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/002.body b/tests/emails/thirdparty/002.dovecot.body
index 0266d1f..0266d1f 100644
--- a/tests/emails/thirdparty/002.body
+++ b/tests/emails/thirdparty/002.dovecot.body
diff --git a/tests/emails/thirdparty/002.bodystructure b/tests/emails/thirdparty/002.dovecot.bodystructure
index 8bba9f4..8bba9f4 100644
--- a/tests/emails/thirdparty/002.bodystructure
+++ b/tests/emails/thirdparty/002.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/003.cyrus.body b/tests/emails/thirdparty/003.cyrus.body
new file mode 100644
index 0000000..ac1054f
--- /dev/null
+++ b/tests/emails/thirdparty/003.cyrus.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" "UTF-8") NIL NIL "8BIT" 23 1)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "QUOTED-PRINTABLE" 41 1)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "BASE64" 34 1) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/003.cyrus.bodystructure b/tests/emails/thirdparty/003.cyrus.bodystructure
new file mode 100644
index 0000000..9682031
--- /dev/null
+++ b/tests/emails/thirdparty/003.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 35 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "BINARY" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "8BIT" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "QUOTED-PRINTABLE" 41 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "BASE64" 34 1 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/003.body b/tests/emails/thirdparty/003.dovecot.body
index a43c6ca..a43c6ca 100644
--- a/tests/emails/thirdparty/003.body
+++ b/tests/emails/thirdparty/003.dovecot.body
diff --git a/tests/emails/thirdparty/003.bodystructure b/tests/emails/thirdparty/003.dovecot.bodystructure
index 5e413bb..5e413bb 100644
--- a/tests/emails/thirdparty/003.bodystructure
+++ b/tests/emails/thirdparty/003.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/004.cyrus.body b/tests/emails/thirdparty/004.cyrus.body
new file mode 100644
index 0000000..560576e
--- /dev/null
+++ b/tests/emails/thirdparty/004.cyrus.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 "7BIT" 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.cyrus.bodystructure b/tests/emails/thirdparty/004.cyrus.bodystructure
new file mode 100644
index 0000000..0d14f8c
--- /dev/null
+++ b/tests/emails/thirdparty/004.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "6BIT" 35 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "7BITS" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "7BIT" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "7-BIT" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "8-BIT" 23 1 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "UTF-8") NIL NIL "7BIT" 41 1 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/004.body b/tests/emails/thirdparty/004.dovecot.body
index 1fadadb..1fadadb 100644
--- a/tests/emails/thirdparty/004.body
+++ b/tests/emails/thirdparty/004.dovecot.body
diff --git a/tests/emails/thirdparty/004.bodystructure b/tests/emails/thirdparty/004.dovecot.bodystructure
index 501d782..501d782 100644
--- a/tests/emails/thirdparty/004.bodystructure
+++ b/tests/emails/thirdparty/004.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/005.body b/tests/emails/thirdparty/005.dovecot.body
index 4d3e042..4d3e042 100644
--- a/tests/emails/thirdparty/005.body
+++ b/tests/emails/thirdparty/005.dovecot.body
diff --git a/tests/emails/thirdparty/005.bodystructure b/tests/emails/thirdparty/005.dovecot.bodystructure
index 6fc310d..6fc310d 100644
--- a/tests/emails/thirdparty/005.bodystructure
+++ b/tests/emails/thirdparty/005.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/006.cyrus.body b/tests/emails/thirdparty/006.cyrus.body
new file mode 100644
index 0000000..1003268
--- /dev/null
+++ b/tests/emails/thirdparty/006.cyrus.body
@@ -0,0 +1 @@
+(BODY (((("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "7BIT" 90 1)("TEXT" "PLAIN" NIL NIL NIL "BINARY" 27 0) "ALTERNATIVE")("SIGNATURE" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 21) "SIGNED") "MIXED")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/006.cyrus.bodystructure b/tests/emails/thirdparty/006.cyrus.bodystructure
new file mode 100644
index 0000000..1f5b70f
--- /dev/null
+++ b/tests/emails/thirdparty/006.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (((("TEXT" "HTML" ("CHARSET" "us-ascii") NIL NIL "7BIT" 90 1 NIL NIL NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "BINARY" 27 0 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "3") NIL NIL NIL)("SIGNATURE" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 21 NIL 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/006.body b/tests/emails/thirdparty/006.dovecot.body
index 78fa16f..78fa16f 100644
--- a/tests/emails/thirdparty/006.body
+++ b/tests/emails/thirdparty/006.dovecot.body
diff --git a/tests/emails/thirdparty/006.bodystructure b/tests/emails/thirdparty/006.dovecot.bodystructure
index f327e71..f327e71 100644
--- a/tests/emails/thirdparty/006.bodystructure
+++ b/tests/emails/thirdparty/006.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/007.cyrus.body b/tests/emails/thirdparty/007.cyrus.body
new file mode 100644
index 0000000..2a7f619
--- /dev/null
+++ b/tests/emails/thirdparty/007.cyrus.body
@@ -0,0 +1 @@
+(BODY (("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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) 3)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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) 3)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 334 (NIL "funny hat" (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) NIL NIL NIL NIL NIL) (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 25 0)("APPLICATION" "OCTET-STREAM" ("DISPOSITION" "attachment" "NAME" "test.txt") NIL NIL "BINARY" 6) "MIXED") 15) "DIGEST")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/007.cyrus.bodystructure b/tests/emails/thirdparty/007.cyrus.bodystructure
new file mode 100644
index 0000000..a46f5ff
--- /dev/null
+++ b/tests/emails/thirdparty/007.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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 NIL NIL NIL NIL) 3 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 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 NIL NIL NIL NIL) 3 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 334 (NIL "funny hat" (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) (("attachment" NIL "attachment" "user")) NIL NIL NIL NIL NIL) (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 25 0 NIL NIL NIL NIL)("APPLICATION" "OCTET-STREAM" ("DISPOSITION" "attachment" "NAME" "test.txt") NIL NIL "BINARY" 6 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "2") NIL NIL NIL) 15 NIL NIL NIL NIL) "DIGEST" ("BOUNDARY" "1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/007.body b/tests/emails/thirdparty/007.dovecot.body
index 1090b32..1090b32 100644
--- a/tests/emails/thirdparty/007.body
+++ b/tests/emails/thirdparty/007.dovecot.body
diff --git a/tests/emails/thirdparty/007.bodystructure b/tests/emails/thirdparty/007.dovecot.bodystructure
index d805a78..d805a78 100644
--- a/tests/emails/thirdparty/007.bodystructure
+++ b/tests/emails/thirdparty/007.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/008.cyrus.body b/tests/emails/thirdparty/008.cyrus.body
new file mode 100644
index 0000000..9bcae55
--- /dev/null
+++ b/tests/emails/thirdparty/008.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "X-MYOWN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 7 1)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 465 ("Sun, 12 Aug 2012 12:34:56 +0300" "submsg" ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) NIL NIL NIL NIL NIL) (("TEXT" "HTML" NIL 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") 32)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 12 0) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/008.cyrus.bodystructure b/tests/emails/thirdparty/008.cyrus.bodystructure
new file mode 100644
index 0000000..f934765
--- /dev/null
+++ b/tests/emails/thirdparty/008.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "X-MYOWN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 7 1 NIL NIL NIL NIL)("MESSAGE" "RFC822" NIL NIL NIL "7BIT" 465 ("Sun, 12 Aug 2012 12:34:56 +0300" "submsg" ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) ((NIL NIL "sub" "domain.org")) NIL NIL NIL NIL NIL) (("TEXT" "HTML" NIL NIL NIL "7BIT" 20 1 NIL NIL NIL NIL)((("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 9 0 NIL NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 10 0 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "sub3") NIL NIL NIL)("TEXT" "PLAIN" ("CHARSET" "us-ascii") NIL NIL "7BIT" 10 0 NIL NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "sub2") NIL NIL NIL) "ALTERNATIVE" ("BOUNDARY" "sub1") NIL NIL NIL) 32 NIL NIL NIL NIL)("TEXT" "PLAIN" NIL NIL NIL "7BIT" 12 0 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "foo bar") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/008.body b/tests/emails/thirdparty/008.dovecot.body
index 9b5f082..9b5f082 100644
--- a/tests/emails/thirdparty/008.body
+++ b/tests/emails/thirdparty/008.dovecot.body
diff --git a/tests/emails/thirdparty/008.bodystructure b/tests/emails/thirdparty/008.dovecot.bodystructure
index b62d60e..b62d60e 100644
--- a/tests/emails/thirdparty/008.bodystructure
+++ b/tests/emails/thirdparty/008.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/009.cyrus.body b/tests/emails/thirdparty/009.cyrus.body
new file mode 100644
index 0000000..d2ad277
--- /dev/null
+++ b/tests/emails/thirdparty/009.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 48 0)("MESSAGE" "PARTIAL" ("NUMBER" "1" "TOTAL" "5" "ID" "heks68ewe@example.org") NIL NIL "7BIT" 247) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/009.cyrus.bodystructure b/tests/emails/thirdparty/009.cyrus.bodystructure
new file mode 100644
index 0000000..217a986
--- /dev/null
+++ b/tests/emails/thirdparty/009.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 48 0 NIL NIL NIL NIL)("MESSAGE" "PARTIAL" ("NUMBER" "1" "TOTAL" "5" "ID" "heks68ewe@example.org") NIL NIL "7BIT" 247 NIL NIL NIL NIL) "MIXED" ("BOUNDARY" "1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/009.body b/tests/emails/thirdparty/009.dovecot.body
index 2db6b88..2db6b88 100644
--- a/tests/emails/thirdparty/009.body
+++ b/tests/emails/thirdparty/009.dovecot.body
diff --git a/tests/emails/thirdparty/009.bodystructure b/tests/emails/thirdparty/009.dovecot.bodystructure
index c7d271d..c7d271d 100644
--- a/tests/emails/thirdparty/009.bodystructure
+++ b/tests/emails/thirdparty/009.dovecot.bodystructure
diff --git a/tests/emails/thirdparty/010.cyrus.body b/tests/emails/thirdparty/010.cyrus.body
new file mode 100644
index 0000000..a3af4ae
--- /dev/null
+++ b/tests/emails/thirdparty/010.cyrus.body
@@ -0,0 +1 @@
+(BODY (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 18 0) "MIXED")) \ No newline at end of file
diff --git a/tests/emails/thirdparty/010.cyrus.bodystructure b/tests/emails/thirdparty/010.cyrus.bodystructure
new file mode 100644
index 0000000..8031ada
--- /dev/null
+++ b/tests/emails/thirdparty/010.cyrus.bodystructure
@@ -0,0 +1 @@
+(BODYSTRUCTURE (("TEXT" "PLAIN" NIL NIL NIL "BINARY" 18 0 NIL NIL ("JA") NIL) "MIXED" ("BOUNDARY" "1") NIL NIL NIL)) \ No newline at end of file
diff --git a/tests/emails/thirdparty/010.body b/tests/emails/thirdparty/010.dovecot.body
index 01164f5..01164f5 100644
--- a/tests/emails/thirdparty/010.body
+++ b/tests/emails/thirdparty/010.dovecot.body
diff --git a/tests/emails/thirdparty/010.bodystructure b/tests/emails/thirdparty/010.dovecot.bodystructure
index 15ddd24..15ddd24 100644
--- a/tests/emails/thirdparty/010.bodystructure
+++ b/tests/emails/thirdparty/010.dovecot.bodystructure
diff --git a/tests/send-to-imap.py b/tests/send-to-imap.py
index 42faee0..46a97a6 100644
--- a/tests/send-to-imap.py
+++ b/tests/send-to-imap.py
@@ -29,6 +29,32 @@ import sys
# maddy -config /data/maddy.conf run --debug
#
# docker run --rm -it -v maddydata:/data-p 143:143 -p 993:993 foxcpp/maddy
+#
+# -- Cyrus --
+# docker run --rm -it --name cyrus -v /dev/log:/dev/log -p 143:143 -p 993:993 debian:buster
+# apt update; apt install -y cyrus-imapd cyrus-pop3d cyrus-nntpd cyrus-caldav cyrus-admin sasl2-bin vim
+# # ( 1. No Configuration / 8. Europe / 37. Paris / yes)
+# vim /etc/imapd.conf
+# # (uncomment 'admins: cyrus')
+# touch /var/lib/cyrus/tls_sessions.db
+# chown cyrus:mail /var/lib/cyrus/tls_sessions.db
+# mkdir /run/cyrus
+# chown -R cyrus:mail /run/cyrus
+# cyrmaster -D -l 32 -C /etc/imapd.conf -M /etc/cyrus.conf
+# docker exec -ti --name cyrus /bin/bash
+# saslpasswd2 cyrus
+# # (put "cyrus" as password)
+# saslpasswd2 test
+# # (put "pass" as password)
+# cyradm -u cyrus localhost
+# cm kzUXL7HyS5OjLcU8
+# setaclmailbox kzUXL7HyS5OjLcU8 test ktelrswip
+#
+# -> note, must be run between 2 send-imap commands in cyradm
+# localhost> setaclmailbox kzUXL7HyS5OjLcU8 cyrus x
+# localhost> dm kzUXL7HyS5OjLcU8
+# localhost> cm kzUXL7HyS5OjLcU8
+# localhost> setaclmailbox kzUXL7HyS5OjLcU8 test ktelrswip
def rebuild_body_res(b):
bb = b''
@@ -49,7 +75,7 @@ parameters = {
"con": IMAP4_SSL,
"user": "test",
"pw": "pass",
- "ext": "",
+ "ext": ".dovecot",
},
"maddy": {
"con": IMAP4_SSL,
@@ -57,6 +83,12 @@ parameters = {
"pw": "pass",
"ext": ".maddy",
},
+ "cyrus": {
+ "con": IMAP4,
+ "user": "test",
+ "pw": "pass",
+ "ext": ".cyrus",
+ }
}
conf = parameters[target]