Bug: 12970 More fixes for S/MIME handling in EAS.