Improve parsing PGP/MIME messages