diff --git a/base_search_mail_content/__manifest__.py b/base_search_mail_content/__manifest__.py
index fb2d3522..26831a25 100644
--- a/base_search_mail_content/__manifest__.py
+++ b/base_search_mail_content/__manifest__.py
@@ -6,7 +6,7 @@
 
 {
     "name": "Base Search Mail Content",
-    "version": "11.0.1.0.0",
+    "version": "11.0.1.0.1",
     "author": "Eficent,"
               "SerpentCS,"
               "Tecnativa,"
diff --git a/base_search_mail_content/models/mail_thread.py b/base_search_mail_content/models/mail_thread.py
index 17ba7bf1..a58c6fea 100644
--- a/base_search_mail_content/models/mail_thread.py
+++ b/base_search_mail_content/models/mail_thread.py
@@ -54,7 +54,7 @@ class MailThread(models.AbstractModel):
                 }
             })
 
-            for node in doc.xpath("//field[1]"):
+            for node in doc.xpath("//field[last()]"):
                 # Add message_content in search view
                 elem = etree.Element(
                     'field',