improve the mailing mechanism