Fix message preloading (issue in last commit)