diff --git a/README.md b/README.md
index fc987dc5750..22edfd55301 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ addon | version | maintainers | summary
[html_text](html_text/) | 18.0.1.0.0 | | Generate excerpts from any HTML field
[iap_alternative_provider](iap_alternative_provider/) | 18.0.1.0.0 |
| Base module for providing alternative provider for iap apps
[jsonifier](jsonifier/) | 18.0.1.1.1 | | JSON-ify data for all models
-[mail_cleanup](mail_cleanup/) | 18.0.1.0.1 | | Mark as read or delete mails after a set time
+[mail_cleanup](mail_cleanup/) | 18.0.1.0.2 | | Mark as read or delete mails after a set time
[mail_template_attachment_per_lang](mail_template_attachment_per_lang/) | 18.0.1.0.0 | | Set language specific attachments on mail templates.
[module_analysis](module_analysis/) | 18.0.1.0.0 |
| Add analysis tools regarding installed modules to know which installed modules comes from Odoo Core, OCA, or are custom modules
[module_auto_update](module_auto_update/) | 18.0.1.0.1 | | Automatically update Odoo modules
diff --git a/mail_cleanup/README.rst b/mail_cleanup/README.rst
index 54696390bb9..55798cca8d8 100644
--- a/mail_cleanup/README.rst
+++ b/mail_cleanup/README.rst
@@ -11,7 +11,7 @@ Mail cleanup
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- !! source digest: sha256:1c8f7c5378b459f9a9fcf644ee4a95a4bc193225e58b73502defbedc4c2d6bf6
+ !! source digest: sha256:b67f9f7207a78cd4df55008d31ccfb9f7b3d260bd4cccd2fbf2d0ae99fd6a749
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/mail_cleanup/__manifest__.py b/mail_cleanup/__manifest__.py
index fbd5a10ea5e..8f27f3098d6 100644
--- a/mail_cleanup/__manifest__.py
+++ b/mail_cleanup/__manifest__.py
@@ -2,7 +2,7 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
{
"name": "Mail cleanup",
- "version": "18.0.1.0.1",
+ "version": "18.0.1.0.2",
"category": "Tools",
"summary": "Mark as read or delete mails after a set time",
"author": "Camptocamp, " "Odoo Community Association (OCA)",
diff --git a/mail_cleanup/models/fetchmail_server.py b/mail_cleanup/models/fetchmail_server.py
index e23649a3982..ace780d31b0 100644
--- a/mail_cleanup/models/fetchmail_server.py
+++ b/mail_cleanup/models/fetchmail_server.py
@@ -51,7 +51,6 @@ def _cleanup_fetchmail_server(self, server, imap_server):
expiration_date = datetime.date.today()
expiration_date -= relativedelta(days=server.cleanup_days)
search_text = expiration_date.strftime("(UNSEEN BEFORE %d-%b-%Y)")
- imap_server.select()
result, data = imap_server.search(None, search_text)
for num in data[0].split():
try:
@@ -86,7 +85,6 @@ def _purge_fetchmail_server(self, server, imap_server):
purge_date = datetime.date.today()
purge_date -= relativedelta(days=server.purge_days)
search_text = purge_date.strftime("(BEFORE %d-%b-%Y)")
- imap_server.select()
result, data = imap_server.search(None, search_text)
for num in data[0].split():
try:
@@ -122,6 +120,7 @@ def fetch_mail(self, raise_exception=True):
if server.server_type == "imap":
try:
imap_server = server.connect()
+ imap_server.select()
if server.cleanup_days > 0:
self._cleanup_fetchmail_server(server, imap_server)
if server.purge_days > 0:
diff --git a/mail_cleanup/static/description/index.html b/mail_cleanup/static/description/index.html
index 40b28a93f4f..3525f9c22c0 100644
--- a/mail_cleanup/static/description/index.html
+++ b/mail_cleanup/static/description/index.html
@@ -372,7 +372,7 @@