Message body is now stored correctly