Fixed issue with messages loading