Appstate remove of message_wrapping