1.1.0.21 Update

Merged in Secure Messaging