change to work with new MessageMenu