Fixed conflict between decode-attachement and broken-folding patches.
Eunit test for decode-multipart-headers patch #36