diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ddc12aefaaaf9..06686d55279a3 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3396,15 +3396,24 @@ config.skip_tls_verify = Skip TLS Verification
 config.mailer_config = Mailer Configuration
 config.mailer_enabled = Enabled
 config.mailer_enable_helo = Enable HELO
+config.mailer_helo_hostname = HELO Hostname
 config.mailer_name = Name
 config.mailer_protocol = Protocol
 config.mailer_smtp_addr = SMTP Addr
 config.mailer_smtp_port = SMTP Port
+config.mailer_smtp_user = SMTP User
 config.mailer_user = User
 config.mailer_use_sendmail = Use Sendmail
 config.mailer_sendmail_path = Sendmail Path
 config.mailer_sendmail_args = Extra Arguments to Sendmail
 config.mailer_sendmail_timeout = Sendmail Timeout
+config.mailer_sendmail_convert_CRLF = Convert CRLF to LF for Sendmail
+config.mailer_subject_prefix = Subject Prefix
+config.use_client_cert = Use Client Certificate
+config.force_trust_server_cert = Force Trust Server Certificate
+config.mailer_from_addr = From Address
+config.mailer_envelope_from_addr = Envelope From Address
+config.mailer_from_display_name_format = From Display Name Format
 config.mailer_use_dummy = Dummy
 config.test_email_placeholder = Email Address (e.g. test@example.com)
 config.send_test_mail = Send Testing Email
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 080b2cd3d6bab..5e4200a12e7b7 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -209,6 +209,8 @@
 						<dd>{{.Mailer.SendmailArgs}}</dd>
 						<dt>{{ctx.Locale.Tr "admin.config.mailer_sendmail_timeout"}}</dt>
 						<dd>{{.Mailer.SendmailTimeout}} {{ctx.Locale.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{ctx.Locale.Tr "admin.config.mailer_sendmail_convert_CRLF"}}</dt>
+						<dd>{{svg (Iif .Mailer.SendmailConvertCRLF "octicon-check" "octicon-x")}}</dd>
 					{{else if eq .Mailer.Protocol "dummy"}}
 						<dt>{{ctx.Locale.Tr "admin.config.mailer_use_dummy"}}</dt>
 						<dd>{{svg "octicon-check"}}</dd>
@@ -217,13 +219,37 @@
 						<dd>{{.Mailer.Protocol}}</dd>
 						<dt>{{ctx.Locale.Tr "admin.config.mailer_enable_helo"}}</dt>
 						<dd>{{svg (Iif .Mailer.EnableHelo "octicon-check" "octicon-x")}}</dd>
+						{{if and .Mailer.EnableHelo .Mailer.HeloHostname}}
+							<dt>{{ctx.Locale.Tr "admin.config.mailer_helo_hostname"}}</dt>
+							<dd>{{.Mailer.HeloHostname}}</dd>
+						{{end}}
 						<dt>{{ctx.Locale.Tr "admin.config.mailer_smtp_addr"}}</dt>
 						<dd>{{.Mailer.SMTPAddr}}</dd>
 						<dt>{{ctx.Locale.Tr "admin.config.mailer_smtp_port"}}</dt>
 						<dd>{{.Mailer.SMTPPort}}</dd>
+						<dt>{{ctx.Locale.Tr "admin.config.mailer_smtp_user"}}</dt>
+						<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd>
+						<dt>{{ctx.Locale.Tr "admin.config.use_client_cert"}}</dt>
+						<dd>{{svg (Iif .Mailer.UseClientCert "octicon-check" "octicon-x")}}</dd>
+						<dt>{{ctx.Locale.Tr "admin.config.force_trust_server_cert"}}</dt>
+						<dd>{{svg (Iif .Mailer.ForceTrustServerCert "octicon-check" "octicon-x")}}</dd>
+					{{end}}
+					{{if .Mailer.From}}
+						<dt>{{ctx.Locale.Tr "admin.config.mailer_from_addr"}}</dt>
+						<dd>{{.Mailer.From}}</dd>
+					{{end}}
+					{{if .Mailer.EnvelopeFrom}}
+						<dt>{{ctx.Locale.Tr "admin.config.mailer_envelope_from_addr"}}</dt>
+						<dd>{{.Mailer.EnvelopeFrom}}</dd>
+					{{end}}
+					{{if .Mailer.FromDisplayNameFormat}}
+						<dt>{{ctx.Locale.Tr "admin.config.mailer_from_display_name_format"}}</dt>
+						<dd>{{.Mailer.FromDisplayNameFormat}}</dd>
+					{{end}}
+					{{if .Mailer.SubjectPrefix}}
+						<dt>{{ctx.Locale.Tr "admin.config.mailer_subject_prefix"}}</dt>
+						<dd>{{.Mailer.SubjectPrefix}}</dd>
 					{{end}}
-					<dt>{{ctx.Locale.Tr "admin.config.mailer_user"}}</dt>
-					<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd>
 					<div class="divider"></div>
 					<dt class="tw-py-1 tw-flex tw-items-center">{{ctx.Locale.Tr "admin.config.send_test_mail"}}</dt>
 					<dd class="tw-py-0">