e-mail fix