Use EncryptedMessageService instead of MessageService
Rename EncrytedMessageService to EncryptedMessageService