Instead of getting messageStore.messages from the freshStore returned by freshMessageStore... we use the messageStoreOps returned by freshMessageStore to compute the new message store.
Note that a messageStore.messages is still being created within freshMessageStore(...) and will be removed in a subsequent diff