E-mail fix