e-mail fixes