Improve emailing (part 2)