Addressing the issues with the loading of messages