MOBILE-783 messages: Move to another function the current message list code