Small adjust on mailing
Improvement on mailing