CNS-302, CNS-567: Fixes issues on messaging system