Tidy up sending of emails