Email bug fix 1.0