Allow more control over the message_content field

Allow more control over the message_content field by only including the
actual message in the "message" string.