Various S/MIME fixes.