From ecdef797f996c58559d42917088d389c5f4b012a Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Thu, 6 May 2021 17:20:33 +0200
Subject: [PATCH] generate a message_id at the beginning of email processing

---
 email_handler.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index 8b4bc068..1991f5a8 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -1639,16 +1639,17 @@ class MailHandler:
 
     def _handle(self, envelope: Envelope):
         start = time.time()
+
+        # generate a different message_id to keep track of an email lifecycle
+        message_id = str(uuid.uuid4())
+        set_message_id(message_id)
+
         LOG.i(
             "===>> New message, mail from %s, rctp tos %s ",
             envelope.mail_from,
             envelope.rcpt_tos,
         )
 
-        # generate a different message_id to keep track of an email lifecycle
-        message_id = str(uuid.uuid4())
-        set_message_id(message_id)
-
         app = new_app()
         with app.app_context():
             ret = handle(envelope)