More email stuff

@iamEAP take a look.