Simplify message store, proper asynchronous message loading