Improve Chat Secure Usability

https://opensourcedesign.net/pr-preview/pr-591/jobs/improve-chat-secure-usability/