Restore msg class for S/MIME after move