Fix the S/MIME code to use canonical MIME format for