Some minor email bug fixes