diff --git a/content/applications/productivity.rst b/content/applications/productivity.rst
index 1790d896e..b9c2deef0 100644
--- a/content/applications/productivity.rst
+++ b/content/applications/productivity.rst
@@ -8,3 +8,4 @@ Productivity
productivity/discuss
productivity/iot
productivity/studio
+ productivity/mail_client_extension
diff --git a/content/applications/productivity/mail_client_extension.rst b/content/applications/productivity/mail_client_extension.rst
new file mode 100644
index 000000000..fd471704c
--- /dev/null
+++ b/content/applications/productivity/mail_client_extension.rst
@@ -0,0 +1,11 @@
+======================
+Mail Client Extensions
+======================
+
+.. toctree::
+ :titlesonly:
+
+ mail_client_extension/gmail_extension
+ mail_client_extension/outlook_extension
+ mail_client_extension/pricing
+
diff --git a/content/applications/productivity/mail_client_extension/gmail_extension.rst b/content/applications/productivity/mail_client_extension/gmail_extension.rst
new file mode 100644
index 000000000..ee7278197
--- /dev/null
+++ b/content/applications/productivity/mail_client_extension/gmail_extension.rst
@@ -0,0 +1,96 @@
+===============
+Gmail Extension
+===============
+
+The **Odoo Gmail Extension** is a connector that bridges your Gmail mailbox with your Odoo database.
+
+This extension allows you to:
+
+- Create leads from emails sent to your mailbox.
+- Create tickets from emails sent to your email address.
+- Centralize Prospects' emails into a CRM.
+- Generate Tasks from emails sent to your email address in any Odoo project.
+- Search and store insights on your contacts.
+
+.. image:: media/gmail-extension-overview.png
+ :align: center
+ :alt: Overview of the Gmail Extension in Gmail
+
+.. important::
+ The Gmail Extension uses *Partner Autocomplete IAP credits* to search and store insights on
+ your contacts. See the :doc:`Pricing section <./pricing>` for more information.
+
+.. _gmail_extension/configuration:
+
+Configuration
+=============
+
+The Gmail Extension requires to be configured both in Odoo and in Gmail.
+
+.. _gmail_extension/enable-feature:
+
+Enable the feature on your database
+-----------------------------------
+
+To enable this feature on your Odoo database, go to :menuselection:`Settings --> General Settings -->
+Integrations`, enable **Mail Plugin**, and click on *Save*.
+
+.. _gmail_extension/add-in-installation:
+
+Install the add-in on Gmail
+---------------------------
+
+To install the add-in,
+
+.. |gmail-addin-project-url| raw:: html
+
+ Gmail Add-In Project
+
+#. Go on the following URL: |gmail-addin-project-url|.
+
+#. If you are logged with many Google account at the same time, check that you are using the one on which you want to install the add-in
+
+ .. image:: media/gmail-extension-check-login.png
+ :align: center
+ :alt: Check your login
+
+#. Click on **Publish** then **Deploy from manifest...**
+
+ .. image:: media/gmail-extension-deploy-from-manifest.png
+ :align: center
+ :alt: Deploy from manifest
+
+#. Click on **Install add-on** and the Odoo plugin will be available on Gmail
+
+ .. image:: media/gmail-extension-install-addon.png
+ :align: center
+ :alt: Install the addon
+
+Connect to your database
+------------------------
+
+#. Open any email in your Gmail inbox and click on the Odoo icon.
+ This opens the extension as a panel on the right side of your screen.
+
+ .. image:: media/gmail-extension-open-addon.png
+ :align: center
+ :alt: Open the Gmail add-in
+
+#. Click on *login* at the bottom of the extension.
+
+#. Insert your database's URL then click on *Login*.
+
+#. Log into your database by entering your credentials. Skip this step if you are already logged in
+ with this browser.
+
+#. A message asks you if you want to let Gmail access your Odoo database. Click on *Allow* to
+ complete the connection.
+
+ .. important::
+ Make sure first to :ref:`enable the feature on your database
+ `.
+
+.. note::
+ The extension displays some information, even if you do not connect it to any Odoo database.
+ Note that only a limited amount of contact enrichment requests are available as a trial, as this
+ feature requires prepaid credits. See the :doc:`Pricing section <./pricing>` for more information.
diff --git a/content/applications/productivity/mail_client_extension/media/gmail-extension-check-login.png b/content/applications/productivity/mail_client_extension/media/gmail-extension-check-login.png
new file mode 100644
index 000000000..4f1be8938
Binary files /dev/null and b/content/applications/productivity/mail_client_extension/media/gmail-extension-check-login.png differ
diff --git a/content/applications/productivity/mail_client_extension/media/gmail-extension-credits-message.png b/content/applications/productivity/mail_client_extension/media/gmail-extension-credits-message.png
new file mode 100644
index 000000000..c18080689
Binary files /dev/null and b/content/applications/productivity/mail_client_extension/media/gmail-extension-credits-message.png differ
diff --git a/content/applications/productivity/mail_client_extension/media/gmail-extension-deploy-from-manifest.png b/content/applications/productivity/mail_client_extension/media/gmail-extension-deploy-from-manifest.png
new file mode 100644
index 000000000..6e92ba31b
Binary files /dev/null and b/content/applications/productivity/mail_client_extension/media/gmail-extension-deploy-from-manifest.png differ
diff --git a/content/applications/productivity/mail_client_extension/media/gmail-extension-install-addon.png b/content/applications/productivity/mail_client_extension/media/gmail-extension-install-addon.png
new file mode 100644
index 000000000..2a6eda43f
Binary files /dev/null and b/content/applications/productivity/mail_client_extension/media/gmail-extension-install-addon.png differ
diff --git a/content/applications/productivity/mail_client_extension/media/gmail-extension-open-addon.png b/content/applications/productivity/mail_client_extension/media/gmail-extension-open-addon.png
new file mode 100644
index 000000000..207c43366
Binary files /dev/null and b/content/applications/productivity/mail_client_extension/media/gmail-extension-open-addon.png differ
diff --git a/content/applications/productivity/mail_client_extension/media/gmail-extension-overview.png b/content/applications/productivity/mail_client_extension/media/gmail-extension-overview.png
new file mode 100644
index 000000000..759e7cf81
Binary files /dev/null and b/content/applications/productivity/mail_client_extension/media/gmail-extension-overview.png differ
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-add-in-url.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-add-in-url.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-add-in-url.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-add-in-url.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-credits-message.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-credits-message.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-credits-message.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-credits-message.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-custom-add-ins.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-custom-add-ins.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-custom-add-ins.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-custom-add-ins.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-customize-actions.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-customize-actions.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-customize-actions.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-customize-actions.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-database-url.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-database-url.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-database-url.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-database-url.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-default-actions.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-default-actions.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-default-actions.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-default-actions.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-get-add-ins.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-get-add-ins.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-get-add-ins.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-get-add-ins.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-more-actions.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-more-actions.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-more-actions.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-more-actions.png
diff --git a/content/applications/sales/crm/optimize/media/outlook-extension-overview.png b/content/applications/productivity/mail_client_extension/media/outlook-extension-overview.png
similarity index 100%
rename from content/applications/sales/crm/optimize/media/outlook-extension-overview.png
rename to content/applications/productivity/mail_client_extension/media/outlook-extension-overview.png
diff --git a/content/applications/sales/crm/optimize/outlook_extension.rst b/content/applications/productivity/mail_client_extension/outlook_extension.rst
similarity index 67%
rename from content/applications/sales/crm/optimize/outlook_extension.rst
rename to content/applications/productivity/mail_client_extension/outlook_extension.rst
index e6b0f0b2a..03bbf54ff 100644
--- a/content/applications/sales/crm/optimize/outlook_extension.rst
+++ b/content/applications/productivity/mail_client_extension/outlook_extension.rst
@@ -2,11 +2,14 @@
Outlook Extension
=================
-The **Odoo CRM Extension** is a connector that bridges your Outlook mailbox with your Odoo database.
+The **Odoo Outlook Extension** is a connector that bridges your Outlook mailbox with your Odoo database.
+
This extension allows you to:
- Create leads from emails sent to your mailbox.
+- Create tickets from emails sent to your email address.
- Centralize Prospects' emails into a CRM.
+- Generate Tasks from emails sent to your email address in any Odoo project.
- Search and store insights on your contacts.
.. image:: media/outlook-extension-overview.png
@@ -18,8 +21,7 @@ This extension allows you to:
.. important::
The Outlook Extension uses *Partner Autocomplete IAP credits* to search and store insights on
- your contacts. See the :ref:`Pricing section ` below for more
- information.
+ your contacts. See the :doc:`Pricing section <./pricing>` for more information.
.. _outlook_extension/configuration:
@@ -33,8 +35,8 @@ The Outlook Extension requires to be configured both in Odoo and in Outlook.
Enable the feature on your database
-----------------------------------
-To enable this feature on your Odoo database, go to :menuselection:`CRM --> Configuration --> Lead
-Generation`, enable **Outlook CRM Extension**, and click on *Save*.
+To enable this feature on your Odoo database, go to :menuselection:`Settings --> General Settings -->
+Integrations`, enable **Mail Plugin**, and click on *Save*.
.. _outlook_extension/add-in-installation:
@@ -129,47 +131,4 @@ Connect to your database
.. note::
The extension displays some information, even if you do not connect it to any Odoo database.
Note that only a limited amount of contact enrichment requests are available as a trial, as this
- feature requires prepaid credits. See the :ref:`Pricing section `
- below for more information.
-
-.. _outlook_extension/pricing:
-
-Pricing
-=======
-
-The extension is **free** and doesn't require any purchase to be installed and used.
-
-However, this extension provides you with *Lead Enrichment* in the **Company Insights** section.
-This service is part of a paid service known as **Lead Generation**.
-
-The extension allows you to test this service for free, whether you connect the extension to a
-database or not. After a while, the extension asks you to buy credits to keep using this additional
-service.
-
-.. image:: media/outlook-extension-credits-message.png
- :align: center
- :alt: "Could not auto-complete the company: not enough credits!" warning message in the Outlook
- extension
-
-.. tip::
- You can buy more *Lead Generation* credits to keep using this service or disregard this message
- and keep using the extension for free without *Lead Enrichment*.
-
-In-App Purchase
----------------
-
-| *Lead Generation* is an *In-App Purchase (IAP)* service, which requires prepaid credits to be
- used. Each request consumes one credit.
-| To buy credits, go to :menuselection:`Settings --> Contacts --> Partner Autocomplete or Odoo IAP -->
- View My Services` and select a package.
-
-.. note::
- - If you run out of credits, the only information populated when clicking on the suggested
- company is the website link and logo.
- - If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free
- trial credits to test the feature.
- - Learn about our *Privacy Policy* `here `_.
-
-.. seealso::
- - :doc:`../../../general/in_app_purchase/in_app_purchase`
- - `Odoo Tutorials: Lead Enrichment `_
\ No newline at end of file
+ feature requires prepaid credits. See the :doc:`Pricing section <./pricing>` for more information.
diff --git a/content/applications/productivity/mail_client_extension/pricing.rst b/content/applications/productivity/mail_client_extension/pricing.rst
new file mode 100644
index 000000000..45f7f4306
--- /dev/null
+++ b/content/applications/productivity/mail_client_extension/pricing.rst
@@ -0,0 +1,48 @@
+=======
+Pricing
+=======
+
+The extension is **free** and doesn't require any purchase to be installed and used.
+
+However, this extension provides you with *Lead Enrichment* in the **Company Insights** section.
+This service is part of a paid service known as **Lead Generation**.
+
+The extension allows you to test this service for free, whether you connect the extension to a
+database or not. After a while, the extension asks you to buy credits to keep using this additional
+service.
+
+|outlook-extension-credits-message| |gmail-extension-credits-message|
+
+.. |outlook-extension-credits-message| image:: media/outlook-extension-credits-message.png
+ :width: 35%
+ :alt: "Could not auto-complete the company: not enough credits!" warning message in the Outlook
+ extension
+
+.. |gmail-extension-credits-message| image:: media/gmail-extension-credits-message.png
+ :width: 35%
+ :alt: "Could not auto-complete the company: not enough credits!" warning message in the Gmail
+ extension
+
+
+.. tip::
+ You can buy more *Lead Generation* credits to keep using this service or disregard this message
+ and keep using the extension for free without *Lead Enrichment*.
+
+In-App Purchase
+===============
+
+| *Lead Generation* is an *In-App Purchase (IAP)* service, which requires prepaid credits to be
+ used. Each request consumes one credit.
+| To buy credits, go to :menuselection:`Settings --> Contacts --> Partner Autocomplete or Odoo IAP -->
+ View My Services` and select a package.
+
+.. note::
+ - If you run out of credits, the only information populated when clicking on the suggested
+ company is the website link and logo.
+ - If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free
+ trial credits to test the feature.
+ - Learn about our *Privacy Policy* `here `_.
+
+.. seealso::
+ - :doc:`../../general/in_app_purchase/in_app_purchase`
+ - `Odoo Tutorials: Lead Enrichment `_
diff --git a/content/applications/sales/crm/optimize.rst b/content/applications/sales/crm/optimize.rst
index 70e81d8b5..c62bb5921 100644
--- a/content/applications/sales/crm/optimize.rst
+++ b/content/applications/sales/crm/optimize.rst
@@ -6,5 +6,4 @@ Optimize your Day-to-Day work
:titlesonly:
optimize/partner_autocomplete
- optimize/outlook_extension
optimize/gamification
diff --git a/redirects.txt b/redirects.txt
index ec6a66fb9..adc9d659b 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -190,7 +190,7 @@ general/odoo_basics/add_user.rst applications/general/odoo_basics/users.rst
# Redirections introduced in 14.0 :
-crm/optimize/mail_client_extension.rst applications/sales/crm/optimize/outlook_extension.rst # mail_client_extension -> outlook_extension | mail_client_extension is the first link provided as a tip in Odoo 14 but should be updated and point directly to outlook_extension
+crm/optimize/mail_client_extension.rst applications/productivity/mail_client_extension/outlook_extension.rst # mail_client_extension -> outlook_extension | mail_client_extension is the first link provided as a tip in Odoo 14 but should be updated and point directly to outlook_extension
crm/optimize/google_calendar_credentials.rst applications/general/calendars/google/google_calendar_credentials.rst # (#765)
purchase/purchases/tender/blanket_orders.rst applications/inventory_and_mrp/purchase/manage_deals/agreements.rst # (#823)