diff --git a/addons/mail/data/mail_templates.xml b/addons/mail/data/mail_templates.xml
index 2f99061e7cd..007417bf72b 100644
--- a/addons/mail/data/mail_templates.xml
+++ b/addons/mail/data/mail_templates.xml
@@ -351,8 +351,7 @@
         <a href="/web#action=mail.action_discuss&amp;active_id=mail.box_moderation" style="background-color: #1abc9c; padding: 20px; text-decoration: none; color: #fff; border-radius: 5px; font-size: 16px;" class="o_default_snippet_text">Moderate Messages</a>
         <br/><br/><br/>
     </div>
-    <p>Thank you!</p>
-</div>
+    <p>Thank you!</p</div>
         </template>
 
        <template id="mail_channel_send_guidelines">
diff --git a/addons/mass_mailing/models/mailing_list.py b/addons/mass_mailing/models/mailing_list.py
index c3aa31baedb..2668b847a2c 100644
--- a/addons/mass_mailing/models/mailing_list.py
+++ b/addons/mass_mailing/models/mailing_list.py
@@ -11,6 +11,8 @@ class MassMailingList(models.Model):
     _order = 'name'
     _description = 'Mailing List'
     _mailing_enabled = True
+    # As this model has his own data merge, avoid to enable the generic data_merge on that model.
+    _disable_data_merge = True
 
     name = fields.Char(string='Mailing List', required=True)
     active = fields.Boolean(default=True)