Improve emailing (part 1)