Split message service into MessageService and EncryptedMessageService