diff --git a/tmpl/gogs.conf b/tmpl/gogs.conf
index 7740c01..594192a 100644
--- a/tmpl/gogs.conf
+++ b/tmpl/gogs.conf
@@ -94,7 +94,11 @@ REQUIRE_SIGNIN_VIEW = false
 ; Cache avatar as picture
 ENABLE_CACHE_AVATAR = false
 ; Mail notification
+%if %%getVar('gogs_mail','non') == 'non'
 ENABLE_NOTIFY_MAIL = false
+%else
+ENABLE_NOTIFY_MAIL = true
+%end if
 ; More detail: https://github.com/gogits/gogs/issues/165
 ENABLE_REVERSE_PROXY_AUTHENTICATION = false
 ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
@@ -120,11 +124,11 @@ SUBJECT = %(APP_NAME)s
 ; Gmail: smtp.gmail.com:587
 ; QQ: smtp.qq.com:25
 ; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
-%if %%getVar('activer_exim_relay_smtp','non') == 'oui'
-HOST = %%exim_relay_smtp
-%else
+   %if %%getVar('activer_exim_relay_smtp','non') == 'oui'
+HOST = %%exim_relay_smtp:25
+   %else
 HOST = 127.0.0.1
-%end if
+   %end if
 ; Do not verify the certificate of the server. Only use this for self-signed certificates
 SKIP_VERIFY = true
 ; Use client certificate
@@ -132,14 +136,17 @@ USE_CERTIFICATE = false
 CERT_FILE = custom/mailer/cert.pem
 KEY_FILE = custom/mailer/key.pem
 ; Mail from address, RFC 5322. This can be just an email address, or the "Name" <email@example.com> format 
-%if %%getVar('gogs_mail_from','M-M-M-M') == 'M-M-M-M'
+   %if %%getVar('gogs_mail_from','M-M-M-M') == 'M-M-M-M'
 FROM = %%system_mail_from
-%else
+   %else
 FROM = %%gogs_mail_from
-%end if
+   %end if
 ; Mailer user name and password
 ; USER =
 ; PASSWD =
+%else
+[mailer]
+ENABLED = false
 %end if
 
 [oauth]