MOBILE-738 messages: Several fixes after testing in real sites