mailinfo: move add_message_id and message_id to struct mailinfo