diff --git a/account_email_to_pdf/models/account_move.py b/account_email_to_pdf/models/account_move.py
index 01028d0..8120915 100644
--- a/account_email_to_pdf/models/account_move.py
+++ b/account_email_to_pdf/models/account_move.py
@@ -8,7 +8,7 @@ from datetime import datetime
 from html import escape
 import re
 
-from odoo import models, fields
+from odoo import models, api
 from odoo.tools.misc import find_in_path
 
 _logger = logging.getLogger(__name__)
@@ -17,37 +17,40 @@ _logger = logging.getLogger(__name__)
 class AccountMove(models.Model):
     _inherit = "account.move"
 
-    def message_new(self, msg_dict, custom_values={}):
-        """Override to create a PDF attachment from the email content before processing.
-        This ensures that emails without attachments can still be processed and converted to invoices.
+    @api.model
+    def _routing_check_route(self, message, message_dict, route, raise_exception=True):
+        """Override to create a PDF attachment from the email content before checking the route.
+        The standard Odoo behavior bounces emails without attachments, but we want to
+        process them by generating a PDF from the email content.
         """
-        # Get existing attachments in the email
-        attachments = msg_dict.get("attachments", [])
+        if route[0] == "account.move" and (
+            len(message_dict.get("attachments", [])) < 1
+            or message_dict["attachments"][0][0].lower().endswith(".eml")
+        ):
+            try:
+                # Create a PDF from the email content
+                pdf_attachment = self._create_pdf_from_email(message_dict)
+                if pdf_attachment:
+                    # Add the PDF to the message's attachments
+                    if not message_dict.get("attachments"):
+                        message_dict["attachments"] = []
 
-        # Check if there are attachments that are not the .eml of the message itself
-        regex = re.compile(r"^.*\.eml$", re.IGNORECASE)
-        if len(attachments) > 1 or (len(attachments) == 1 and not regex.match(attachments[0][0])):
-            return super().message_new(msg_dict, custom_values=custom_values)
-
-        try:
-            # Create a PDF from the email content
-            pdf_attachment = self._create_pdf_from_email(msg_dict)
-            if pdf_attachment:
-                # Add the PDF to the message's attachments
-                if not msg_dict.get("attachments"):
-                    msg_dict["attachments"] = []
-
-                # Convert the attachment to the format expected by mail_thread
-                # Format: (name, base64_data, info_dict)
-                attachment_data = (
-                    pdf_attachment["name"],
-                    pdf_attachment["datas"],
-                    {"mimetype": "application/pdf"},
+                    # Convert the attachment to the format expected by mail_thread
+                    # Format: (name, base64_data, info_dict)
+                    attachment_data = (
+                        pdf_attachment["name"],
+                        pdf_attachment["datas"],
+                        {"mimetype": "application/pdf"},
+                    )
+                    message_dict["attachments"].append(attachment_data)
+            except Exception as e:
+                _logger.exception(
+                    "Error creating PDF from email in _routing_check_route: %s", e
                 )
-                attachments.append(attachment_data)
-        except Exception as e:
-            _logger.exception("Error creating PDF from email: %s", e)
-        return super().message_new(msg_dict, custom_values=custom_values)
+
+        return super()._routing_check_route(
+            message, message_dict, route, raise_exception=raise_exception
+        )
 
     @classmethod
     def _html_to_pdf(cls, html_content):
diff --git a/account_email_to_pdf/tests/test_email_to_pdf.py b/account_email_to_pdf/tests/test_email_to_pdf.py
index 8f30d47..29fc512 100644
--- a/account_email_to_pdf/tests/test_email_to_pdf.py
+++ b/account_email_to_pdf/tests/test_email_to_pdf.py
@@ -1,9 +1,7 @@
 from odoo.tests.common import TransactionCase
 from odoo.tools.misc import find_in_path
-import logging
 from datetime import datetime
 
-_logger = logging.getLogger(__name__)
 
 
 class TestHtmlToPdf(TransactionCase):
@@ -173,18 +171,6 @@ Content-Transfer-Encoding: 7bit
         messages = invoice.message_ids
         self.assertEqual(len(messages), 1, "The account move should have one message")
 
-        # Debug message attachments
-        _logger.info("Message ID: %s", messages.id)
-        _logger.info("Message attachments: %s", messages.attachment_ids)
-        _logger.info("Message attachment count: %s", len(messages.attachment_ids))
-
-        # Debug all attachments in the system
-        all_attachments = self.env["ir.attachment"].search(
-            [("res_model", "=", "mail.message"), ("res_id", "=", messages.id)]
-        )
-        _logger.info("All attachments for this message: %s", all_attachments)
-        _logger.info("All attachment count: %s", len(all_attachments))
-
         attachment = messages.attachment_ids
 
         self.assertTrue(attachment, "The message should have an attachment")