Some more finetuning to the email sending