rework EncryptMessage/DecryptMessage