diff --git a/discuss.rst b/discuss.rst
index 1ef6461f4..e977c732d 100644
--- a/discuss.rst
+++ b/discuss.rst
@@ -14,4 +14,5 @@ Discuss
    discuss/team_communication
    discuss/plan_activities
    discuss/mail_twitter
-   discuss/email_servers
\ No newline at end of file
+   discuss/email_servers
+   discuss/advanced
\ No newline at end of file
diff --git a/discuss/advanced.rst b/discuss/advanced.rst
new file mode 100644
index 000000000..ad2b0b857
--- /dev/null
+++ b/discuss/advanced.rst
@@ -0,0 +1,9 @@
+========
+Advanced
+========
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   advanced/emailtemplate
\ No newline at end of file
diff --git a/discuss/advanced/emailtemplate.rst b/discuss/advanced/emailtemplate.rst
new file mode 100644
index 000000000..8f69a5488
--- /dev/null
+++ b/discuss/advanced/emailtemplate.rst
@@ -0,0 +1,59 @@
+===============
+Email Templates
+===============
+
+We all know writing good emails is vital to get a high response rate, but you do not want to
+rewrite the same structure every time, do you? That is where email templates come in.
+Without the need to rewrite the entire email structure every time, you save time to focus on
+the content. Multiple templates also let you deliver the right message to the right audience,
+improving their overall experience with the company.
+
+Enable it and understand a few concepts
+=======================================
+
+The :doc:`Developer mode <../../general/developer_mode/activate>` must be activated. Then, go to
+:menuselection:`Settings --> Technical --> Templates`. A view of the existing templates is shown.
+
+.. warning::
+   **It is highly recommended not to change the content in existing templates unless the user has
+   prior knowledge about placeholders.**
+
+To add a new one, click on *Create* and choose the type of document this template is used with. In
+the example below, the template would be sent to job applicants.
+
+.. image:: media/newtemplate.png
+   :align: center
+   :alt: New email template form in Odoo
+
+| Under *Email Configuration*, fields such as *From*, *To (Emails)*, *To (Partners)*, require
+  placeholders. If the *From* field is not set, the default value is the author’s email alias, if
+  configured, or email address.
+| Under *Advanced Settings*, if an *Outgoing Mail Server* is not set, the one with the highest
+  priority is used.
+| The option *Auto Delete* permanently deletes the emails after they are sent, saving space in your
+  database.
+
+Writing content including placeholder expressions
+-------------------------------------------------
+
+Under the tab *Dynamic Placeholder Generator*, look for the *Field* you would like to use.
+
+.. image:: media/placeholders.png
+   :align: center
+   :alt: View of the dynamic placeholder generator tab under a new template in Odoo
+
+Next, copy the *Placeholder Expression* and paste it in the *Body* of the email, under the *Content*
+tab, using - essentially - the *Code View*.
+
+.. image:: media/codeview.png
+   :align: center
+   :alt: View of the body code view under the content tab in Odoo
+
+Deactivate the *Code View* option by simply clicking on it again, and easily design the message.
+Click on *Preview* to check how the email looks before sending it.
+
+.. image:: media/preview.png
+   :align: center
+   :alt: View of the content with the standard body view in Odoo
+
+
diff --git a/discuss/advanced/media/codeview.png b/discuss/advanced/media/codeview.png
new file mode 100644
index 000000000..5d241d110
Binary files /dev/null and b/discuss/advanced/media/codeview.png differ
diff --git a/discuss/advanced/media/newtemplate.png b/discuss/advanced/media/newtemplate.png
new file mode 100644
index 000000000..abb091804
Binary files /dev/null and b/discuss/advanced/media/newtemplate.png differ
diff --git a/discuss/advanced/media/placeholders.png b/discuss/advanced/media/placeholders.png
new file mode 100644
index 000000000..c75425f79
Binary files /dev/null and b/discuss/advanced/media/placeholders.png differ
diff --git a/discuss/advanced/media/preview.png b/discuss/advanced/media/preview.png
new file mode 100644
index 000000000..399b66062
Binary files /dev/null and b/discuss/advanced/media/preview.png differ