diff --git a/addons/mail/static/src/components/activity/activity.xml b/addons/mail/static/src/components/activity/activity.xml
index 07e714d2890..52a273bc057 100644
--- a/addons/mail/static/src/components/activity/activity.xml
+++ b/addons/mail/static/src/components/activity/activity.xml
@@ -111,7 +111,6 @@
                             <t t-foreach="activityView.mailTemplateViews" t-as="mailTemplateView" t-key="mailTemplateView.localId">
                                 <MailTemplate
                                     className="'o_Activity_mailTemplate'"
-                                    activityLocalId="activityView.activity.localId"
                                     localId="mailTemplateView.localId"
                                     mailTemplateLocalId="mailTemplateView.mailTemplate.localId"
                                 />
diff --git a/addons/mail/static/src/components/mail_template/mail_template.js b/addons/mail/static/src/components/mail_template/mail_template.js
index 8941653883e..15bc6bca295 100644
--- a/addons/mail/static/src/components/mail_template/mail_template.js
+++ b/addons/mail/static/src/components/mail_template/mail_template.js
@@ -10,13 +10,6 @@ export class MailTemplate extends Component {
     // Public
     //--------------------------------------------------------------------------
 
-    /**
-     * @returns {Activity}
-     */
-    get activity() {
-        return this.messaging && this.messaging.models['Activity'].get(this.props.activityLocalId);
-    }
-
     /**
      * @returns {MailTemplate}
      */
@@ -42,7 +35,7 @@ export class MailTemplate extends Component {
     _onClickPreview(ev) {
         ev.stopPropagation();
         ev.preventDefault();
-        this.mailTemplate.preview(this.activity);
+        this.mailTemplate.preview(this.mailTemplateView.activityViewOwner.activity);
     }
 
     /**
@@ -52,14 +45,13 @@ export class MailTemplate extends Component {
     _onClickSend(ev) {
         ev.stopPropagation();
         ev.preventDefault();
-        this.mailTemplate.send(this.activity);
+        this.mailTemplate.send(this.mailTemplateView.activityViewOwner.activity);
     }
 
 }
 
 Object.assign(MailTemplate, {
     props: {
-        activityLocalId: String,
         localId: String,
         mailTemplateLocalId: String,
     },