More importantly, you could change the client to show encryption status before a message is sent and add client-side key management.