move MessagePlus to model package