mailing model fixes