- Use MIMEPart instead of Message when encrypting in PGP/MIME mode. - Wrap text/plain messages in MIMEPart, instead of manipulating payloads manually. - Add a test for wrapping.