Revert "Only use IPM.Note.SMIME.MultipartSigned for SMIME"
This reverts commit 7323a82d1f8d548b85eb1c4cf7cd1e0c0224c246.