diff --git a/doc/setup/email_gateway.rst b/doc/setup/email_gateway.rst
index 5525296da28..e119baa4eb3 100644
--- a/doc/setup/email_gateway.rst
+++ b/doc/setup/email_gateway.rst
@@ -8,7 +8,8 @@ The Odoo mail gateway allows you to inject directly all the received emails in O
 
 Its principle is straightforward: your SMTP server executes the "mailgate" script for every new incoming email.
 
-The script takes care of connecting to your Odoo database through XML-RPC, and send the emails via the MailThread.message_process() feature.
+The script takes care of connecting to your Odoo database through XML-RPC, and send the emails via
+the `MailThread.message_process()` feature.
 
 Prerequisites
 -------------
@@ -18,26 +19,31 @@ Prerequisites
 
 For Postfix
 -----------
-In you alias config (/etc/aliases):
+In you alias config (:file:`/etc/aliases`):
 
 .. code-block:: text
 
-	email@address: "|/odoo-directory/addons/mail/static/scripts/odoo-mailgate.py -d <database-name> -u <userid> -p <password>"
+   email@address: "|/odoo-directory/addons/mail/static/scripts/odoo-mailgate.py -d <database-name> -u <userid> -p <password>"
 
-.. note:: Resources
-    - `Postfix <http://www.postfix.org/documentation.html>`
-    - `Postfix aliases <http://www.postfix.org/aliases.5.html>`
-    - `Postfix virtual <http://www.postfix.org/virtual.8.html>`
+.. note::
+   Resources
+
+   - `Postfix <http://www.postfix.org/documentation.html>`_
+   - `Postfix aliases <http://www.postfix.org/aliases.5.html>`_
+   - `Postfix virtual <http://www.postfix.org/virtual.8.html>`_
 
 
 For Exim
 --------
 .. code-block:: text
 
-	*: |/odoo-directory/addons/mail/static/scripts/odoo-mailgate.py -d <database-name> -u <userid> -p <password>
+   *: |/odoo-directory/addons/mail/static/scripts/odoo-mailgate.py -d <database-name> -u <userid> -p <password>
 
-.. note:: Resources
-    - `Exim <https://www.exim.org/docs.html>`
+.. note::
+   Resources
 
+   - `Exim <https://www.exim.org/docs.html>`_
 
-.. note:: If you don't have access/manage your email server, use `inbound messages<https://www.odoo.com/documentation/user/14.0/discuss/email_servers.html#how-to-manage-inbound-messages>`.
+.. tip::
+   If you don't have access/manage your email server, use `inbound messages
+   <https://www.odoo.com/documentation/user/14.0/discuss/advanced/email_servers.html#how-to-manage-outbound-messages>`_.