[IMP] mass_mailing: Improving code