Adapted check of message type to the new buttons