End-to-End encryption is a highly important feature in chat clients, allowing users to talk to each other securely without fear of message interception or surveillance. The current implementation of OTR in Rocket Chat has a number of limitations, including no support for offline chats. In this project, I will improve Rocket Chat functionality by integrating the Signal protocol, which provides confidentiality, integrity, authentication, forward secrecy and asynchronicity, among other security features, with Rocket Chat.