Improve group emailing mechanism