e-mail -> email, i18n updates