diff --git a/mail_activity/data/ir_model_data.xml b/mail_activity/data/ir_model_data.xml
new file mode 100644
index 00000000..949a9f71
--- /dev/null
+++ b/mail_activity/data/ir_model_data.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo noupdate="1">
+    <!-- inject xmlids so that we can address the records via its
+         mail xmlid as we'd do it in 11.0
+    /-->
+    <record id="xmlid_mail_mt_activities" model="ir.model.data">
+        <field name="model">mail.message.subtype</field>
+        <field name="res_id" ref="mt_activities" />
+        <field name="module">mail</field>
+        <field name="name">mt_activities</field>
+        <field name="noupdate" eval="True" />
+    </record>
+    <record id="xmlid_mail_message_activity_done" model="ir.model.data">
+        <field name="model">ir.ui.view</field>
+        <field name="res_id" ref="message_activity_done" />
+        <field name="module">mail</field>
+        <field name="name">message_activity_done</field>
+        <field name="noupdate" eval="True" />
+    </record>
+</odoo>
diff --git a/mail_activity/data/mail_message_subtype.xml b/mail_activity/data/mail_message_subtype.xml
index a6a44d24..db66331e 100644
--- a/mail_activity/data/mail_message_subtype.xml
+++ b/mail_activity/data/mail_message_subtype.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-    <record id="mail.mt_activities" model="mail.message.subtype">
+    <record id="mt_activities" model="mail.message.subtype">
         <field name="name">Activities</field>
         <field name="default" eval="True"/>
         <field name="internal" eval="True"/>
diff --git a/mail_activity/models/__init__.py b/mail_activity/models/__init__.py
index 23c9c69a..82f924c7 100644
--- a/mail_activity/models/__init__.py
+++ b/mail_activity/models/__init__.py
@@ -5,3 +5,4 @@ from . import mail_activity_type
 from . import mail_activity
 from . import mail_activity_mixin
 from . import res_partner
+from . import mail_message
diff --git a/mail_activity/views/mail_activity.xml b/mail_activity/views/mail_activity.xml
index ea59afaf..a549281a 100644
--- a/mail_activity/views/mail_activity.xml
+++ b/mail_activity/views/mail_activity.xml
@@ -161,7 +161,7 @@
         </field>
     </record>
 
-    <template id="mail.message_activity_done">
+    <template id="message_activity_done">
 <div>
     <p>
         <strong><span t-attf-class="fa #{activity.activity_type_id.icon}"/></strong> <span t-field="activity.activity_type_id.name"/> done