More fiddling with the email notification