diff --git a/addons/fetchmail_gmail/__init__.py b/addons/fetchmail_gmail/__init__.py
deleted file mode 100644
index dc5e6b693d1..00000000000
--- a/addons/fetchmail_gmail/__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_gmail/__manifest__.py b/addons/fetchmail_gmail/__manifest__.py
deleted file mode 100644
index ec9db906501..00000000000
--- a/addons/fetchmail_gmail/__manifest__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-{
-    "name": "Fetchmail Gmail",
-    "version": "1.1",
-    "category": "Hidden",
-    "description": "Google authentication for incoming mail server",
-    "depends": [
-        "google_gmail",
-        "fetchmail",
-    ],
-    "data": ["views/fetchmail_server_views.xml"],
-    "auto_install": True,
-    "license": "LGPL-3",
-}
diff --git a/addons/fetchmail_gmail/i18n/fetchmail_gmail.pot b/addons/fetchmail_gmail/i18n/fetchmail_gmail.pot
deleted file mode 100644
index e4f1f7af6a3..00000000000
--- a/addons/fetchmail_gmail/i18n/fetchmail_gmail.pot
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* fetchmail_gmail
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server saas~15.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-11 14:34+0000\n"
-"PO-Revision-Date: 2022-02-11 14:34+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_gmail
-#: model_terms:ir.ui.view,arch_db:fetchmail_gmail.fetchmail_server_view_form
-msgid ""
-"<i class=\"fa fa-arrow-right\"/>\n"
-"                        Connect your Gmail account"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model_terms:ir.ui.view,arch_db:fetchmail_gmail.fetchmail_server_view_form
-msgid ""
-"<i class=\"fa fa-cog\"/>\n"
-"                        Edit Settings"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model_terms:ir.ui.view,arch_db:fetchmail_gmail.fetchmail_server_view_form
-msgid ""
-"<span attrs=\"{'invisible': ['|', ('server_type', '!=', 'gmail'), ('google_gmail_refresh_token', '=', False)]}\" class=\"badge badge-success\">\n"
-"                        Gmail Token Valid\n"
-"                    </span>"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,field_description:fetchmail_gmail.field_fetchmail_server__google_gmail_access_token
-msgid "Access Token"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,field_description:fetchmail_gmail.field_fetchmail_server__google_gmail_access_token_expiration
-msgid "Access Token Expiration Timestamp"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,field_description:fetchmail_gmail.field_fetchmail_server__google_gmail_authorization_code
-msgid "Authorization Code"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields.selection,name:fetchmail_gmail.selection__fetchmail_server__server_type__gmail
-msgid "Gmail OAuth Authentication"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model,name:fetchmail_gmail.model_fetchmail_server
-msgid "Incoming Mail Server"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,field_description:fetchmail_gmail.field_fetchmail_server__google_gmail_refresh_token
-msgid "Refresh Token"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,field_description:fetchmail_gmail.field_fetchmail_server__server_type
-msgid "Server Type"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model_terms:ir.ui.view,arch_db:fetchmail_gmail.fetchmail_server_view_form
-msgid ""
-"Setup your Gmail API credentials in the general settings to link a Gmail "
-"account."
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,help:fetchmail_gmail.field_fetchmail_server__google_gmail_uri
-msgid "The URL to generate the authorization code from Google"
-msgstr ""
-
-#. module: fetchmail_gmail
-#: model:ir.model.fields,field_description:fetchmail_gmail.field_fetchmail_server__google_gmail_uri
-msgid "URI"
-msgstr ""
diff --git a/addons/fetchmail_gmail/models/__init__.py b/addons/fetchmail_gmail/models/__init__.py
deleted file mode 100644
index 07f7ac623b1..00000000000
--- a/addons/fetchmail_gmail/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/google_gmail/__manifest__.py b/addons/google_gmail/__manifest__.py
index a91d4fd0ed8..419f1bcf3fb 100644
--- a/addons/google_gmail/__manifest__.py
+++ b/addons/google_gmail/__manifest__.py
@@ -7,10 +7,11 @@
     "category": "Hidden",
     "description": "Gmail support for incoming / outgoing mail servers",
     "depends": [
+        "fetchmail",
         "mail",
-        "google_account",
     ],
     "data": [
+        "views/fetchmail_server_views.xml",
         "views/ir_mail_server_views.xml",
         "views/res_config_settings_views.xml",
     ],
diff --git a/addons/google_gmail/models/__init__.py b/addons/google_gmail/models/__init__.py
index 84fb33abfee..bd9edb15849 100644
--- a/addons/google_gmail/models/__init__.py
+++ b/addons/google_gmail/models/__init__.py
@@ -2,5 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import google_gmail_mixin
+
+from . import fetchmail_server
 from . import ir_mail_server
 from . import res_config_settings
diff --git a/addons/fetchmail_gmail/models/fetchmail_server.py b/addons/google_gmail/models/fetchmail_server.py
similarity index 100%
rename from addons/fetchmail_gmail/models/fetchmail_server.py
rename to addons/google_gmail/models/fetchmail_server.py
diff --git a/addons/fetchmail_gmail/views/fetchmail_server_views.xml b/addons/google_gmail/views/fetchmail_server_views.xml
similarity index 100%
rename from addons/fetchmail_gmail/views/fetchmail_server_views.xml
rename to addons/google_gmail/views/fetchmail_server_views.xml