Fix preparation of message object before saving into the cache.
The bug cased e.g. displaying HTML content as plain text for messages
with Content-Type: text/html.