diff --git a/addons/fetchmail_outlook/__init__.py b/addons/fetchmail_outlook/__init__.py
deleted file mode 100644
index dc5e6b693d1..00000000000
--- a/addons/fetchmail_outlook/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import models
diff --git a/addons/fetchmail_outlook/__manifest__.py b/addons/fetchmail_outlook/__manifest__.py
deleted file mode 100644
index 259c29627e9..00000000000
--- a/addons/fetchmail_outlook/__manifest__.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-{
-    "name": "Fetchmail Outlook",
-    "version": "1.0",
-    "category": "Hidden",
-    "description": "OAuth authentication for incoming Outlook mail server",
-    "depends": [
-        "microsoft_outlook",
-        "fetchmail",
-    ],
-    "data": [
-        "views/fetchmail_server_views.xml",
-    ],
-    "auto_install": True,
-    "license": "LGPL-3",
-}
diff --git a/addons/fetchmail_outlook/i18n/fetchmail_outlook.pot b/addons/fetchmail_outlook/i18n/fetchmail_outlook.pot
deleted file mode 100644
index 0d43d81948a..00000000000
--- a/addons/fetchmail_outlook/i18n/fetchmail_outlook.pot
+++ /dev/null
@@ -1,110 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* fetchmail_outlook
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~15.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-09 14:05+0000\n"
-"PO-Revision-Date: 2022-06-09 14:05+0000\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: fetchmail_outlook
-#: model_terms:ir.ui.view,arch_db:fetchmail_outlook.fetchmail_server_view_form
-msgid ""
-"<i class=\"fa fa-arrow-right\"/>\n"
-"                        Connect your Outlook account"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model_terms:ir.ui.view,arch_db:fetchmail_outlook.fetchmail_server_view_form
-msgid ""
-"<i class=\"fa fa-cog\"/>\n"
-"                        Edit Settings"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model_terms:ir.ui.view,arch_db:fetchmail_outlook.fetchmail_server_view_form
-msgid ""
-"<span attrs=\"{'invisible': ['|', ('use_microsoft_outlook_service', '=', False), ('microsoft_outlook_refresh_token', '=', False)]}\" class=\"badge badge-success\">\n"
-"                        Outlook Token Valid\n"
-"                    </span>"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,field_description:fetchmail_outlook.field_fetchmail_server__microsoft_outlook_uri
-msgid "Authentication URI"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model,name:fetchmail_outlook.model_fetchmail_server
-msgid "Incoming Mail Server"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,field_description:fetchmail_outlook.field_fetchmail_server__is_microsoft_outlook_configured
-msgid "Is Outlook Credential Configured"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model_terms:ir.ui.view,arch_db:fetchmail_outlook.fetchmail_server_view_form
-msgid "Outlook"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,field_description:fetchmail_outlook.field_fetchmail_server__microsoft_outlook_access_token
-msgid "Outlook Access Token"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,field_description:fetchmail_outlook.field_fetchmail_server__microsoft_outlook_access_token_expiration
-msgid "Outlook Access Token Expiration Timestamp"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,field_description:fetchmail_outlook.field_fetchmail_server__use_microsoft_outlook_service
-msgid "Outlook Authentication"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,field_description:fetchmail_outlook.field_fetchmail_server__microsoft_outlook_refresh_token
-msgid "Outlook Refresh Token"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: code:addons/fetchmail_outlook/models/fetchmail_server.py:0
-#, python-format
-msgid "Outlook mail server %r only supports IMAP server type."
-msgstr ""
-
-#. module: fetchmail_outlook
-#: code:addons/fetchmail_outlook/models/fetchmail_server.py:0
-#, python-format
-msgid ""
-"Please leave the password field empty for Outlook mail server %r. The OAuth "
-"process does not require it"
-msgstr ""
-
-#. module: fetchmail_outlook
-#: code:addons/fetchmail_outlook/models/fetchmail_server.py:0
-#, python-format
-msgid "SSL is required ."
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model_terms:ir.ui.view,arch_db:fetchmail_outlook.fetchmail_server_view_form
-msgid ""
-"Setup your Outlook API credentials in the general settings to link a Outlook"
-" account."
-msgstr ""
-
-#. module: fetchmail_outlook
-#: model:ir.model.fields,help:fetchmail_outlook.field_fetchmail_server__microsoft_outlook_uri
-msgid "The URL to generate the authorization code from Outlook"
-msgstr ""
diff --git a/addons/fetchmail_outlook/models/__init__.py b/addons/fetchmail_outlook/models/__init__.py
deleted file mode 100644
index 07f7ac623b1..00000000000
--- a/addons/fetchmail_outlook/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import fetchmail_server
diff --git a/addons/microsoft_outlook/__manifest__.py b/addons/microsoft_outlook/__manifest__.py
index 0af1221b549..1c6df5b6d2c 100644
--- a/addons/microsoft_outlook/__manifest__.py
+++ b/addons/microsoft_outlook/__manifest__.py
@@ -5,11 +5,13 @@
     "name": "Microsoft Outlook",
     "version": "1.1",
     "category": "Hidden",
-    "description": "Outlook support for outgoing mail servers",
+    "description": "Outlook support for incoming / outgoing mail servers",
     "depends": [
+        "fetchmail",
         "mail",
     ],
     "data": [
+        "views/fetchmail_server_views.xml",
         "views/ir_mail_server_views.xml",
         "views/res_config_settings_views.xml",
         "views/templates.xml",
diff --git a/addons/microsoft_outlook/models/__init__.py b/addons/microsoft_outlook/models/__init__.py
index 890e54b29c0..0d80b44a934 100644
--- a/addons/microsoft_outlook/models/__init__.py
+++ b/addons/microsoft_outlook/models/__init__.py
@@ -3,5 +3,6 @@
 
 from . import microsoft_outlook_mixin
 
+from . import fetchmail_server
 from . import ir_mail_server
 from . import res_config_settings
diff --git a/addons/fetchmail_outlook/models/fetchmail_server.py b/addons/microsoft_outlook/models/fetchmail_server.py
similarity index 100%
rename from addons/fetchmail_outlook/models/fetchmail_server.py
rename to addons/microsoft_outlook/models/fetchmail_server.py
diff --git a/addons/fetchmail_outlook/tests/__init__.py b/addons/microsoft_outlook/tests/__init__.py
similarity index 100%
rename from addons/fetchmail_outlook/tests/__init__.py
rename to addons/microsoft_outlook/tests/__init__.py
diff --git a/addons/fetchmail_outlook/tests/test_fetchmail_outlook.py b/addons/microsoft_outlook/tests/test_fetchmail_outlook.py
similarity index 100%
rename from addons/fetchmail_outlook/tests/test_fetchmail_outlook.py
rename to addons/microsoft_outlook/tests/test_fetchmail_outlook.py
diff --git a/addons/fetchmail_outlook/views/fetchmail_server_views.xml b/addons/microsoft_outlook/views/fetchmail_server_views.xml
similarity index 100%
rename from addons/fetchmail_outlook/views/fetchmail_server_views.xml
rename to addons/microsoft_outlook/views/fetchmail_server_views.xml