DAR-3098 | BUG: messages and buttons swaped