revert: Simplify and inline add_message_to_msg