Remove MessagesAddTrait in favor of inheritance