ADD some message treatment