Fixes for message protection and sharing UI