fixed e-mail stuff