Fix class for new messages