Small amount of tidying, and email.preview now writes to file