email: Small tidy up following recent changes