diff --git a/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml b/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml
index dd63b1410f2..23fe0f468b6 100644
--- a/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml
+++ b/addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml
@@ -28,8 +28,13 @@
                 </t>
                 <small t-att-title="activityListViewItem.activity.dateDeadline" t-esc="activityListViewItem.delayLabel"/>
             </div>
-            <!-- TODO handle "mail_template_ids" -->
             <ActivityMarkDonePopoverContent t-if="activityListViewItem.markDoneView" record="activityListViewItem.markDoneView"/>
+            <div t-if="activityListViewItem.mailTemplateViews.length > 0" class="mx-3 mt-2">
+                <MailTemplate
+                    t-foreach="activityListViewItem.mailTemplateViews" t-as="mailTemplateView" t-key="mailTemplateView"
+                    record="mailTemplateView"
+                />
+            </div>
         </div>
     </t>
 </templates>
diff --git a/addons/mail/static/src/components/activity/activity.scss b/addons/mail/static/src/components/activity/activity.scss
index 8b7ce6bf630..2c1bf422d26 100644
--- a/addons/mail/static/src/components/activity/activity.scss
+++ b/addons/mail/static/src/components/activity/activity.scss
@@ -2,6 +2,10 @@
 // Layout
 // ------------------------------------------------------------------
 
+.o_Activity_core {
+    min-width: 0;
+}
+
 .o_Activity_detailsUserAvatar {
     object-fit: cover;
     height: 18px;
diff --git a/addons/mail/static/src/components/mail_template/mail_template.xml b/addons/mail/static/src/components/mail_template/mail_template.xml
index 758ca43a6c0..411a462a3ae 100644
--- a/addons/mail/static/src/components/mail_template/mail_template.xml
+++ b/addons/mail/static/src/components/mail_template/mail_template.xml
@@ -3,25 +3,29 @@
 
     <t t-name="mail.MailTemplate" owl="1">
         <t t-if="mailTemplateView">
-            <div class="o_MailTemplate flex-shrink-0 align-items-center d-flex" t-attf-class="{{ className }}" t-ref="root">
-                <i class="fa fa-envelope-o" title="Mail" role="img"/>
-                <span class="o_MailTemplate_name ms-2" t-esc="mailTemplateView.mailTemplate.name"/>
-                <span>:</span>
-                <button
-                    class="o_MailTemplate_button o_MailTemplate_preview btn btn-link py-0"
-                    t-att-data-mail-template-id="mailTemplateView.mailTemplate.id"
-                    t-on-click="mailTemplateView.onClickPreview"
-                >
-                    Preview
-                </button>
-                <em class="o_MailTemplate_text text-500">or</em>
-                <button
-                    class="o_MailTemplate_button o_MailTemplate_send btn btn-link py-0"
-                    t-att-data-mail-template-id="mailTemplateView.mailTemplate.id"
-                    t-on-click="mailTemplateView.onClickSend"
-                >
-                    Send Now
-                </button>
+            <div class="o_MailTemplate d-flex align-items-baseline flex-wrap" t-attf-class="{{ className }}" t-ref="root">
+                <div class="text-truncate">
+                    <i class="fa fa-envelope-o" title="Mail" role="img"/>
+                    <span class="o_MailTemplate_name ms-2" t-esc="mailTemplateView.mailTemplate.name"/>
+                    <span>:</span>
+                </div>
+                <div class="d-flex align-items-baseline">
+                    <button
+                        class="o_MailTemplate_button o_MailTemplate_preview btn btn-link py-0"
+                        t-att-data-mail-template-id="mailTemplateView.mailTemplate.id"
+                        t-on-click="mailTemplateView.onClickPreview"
+                    >
+                        Preview
+                    </button>
+                    <em class="o_MailTemplate_text text-500">or</em>
+                    <button
+                        class="o_MailTemplate_button o_MailTemplate_send btn btn-link py-0"
+                        t-att-data-mail-template-id="mailTemplateView.mailTemplate.id"
+                        t-on-click="mailTemplateView.onClickSend"
+                    >
+                        Send Now
+                    </button>
+                </div>
             </div>
         </t>
     </t>
diff --git a/addons/mail/static/src/models/activity_list_view_item.js b/addons/mail/static/src/models/activity_list_view_item.js
index 7f9ece3b4b2..46ebf4a0732 100644
--- a/addons/mail/static/src/models/activity_list_view_item.js
+++ b/addons/mail/static/src/models/activity_list_view_item.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { registerModel } from '@mail/model/model_core';
-import { attr, one } from '@mail/model/model_field';
+import { attr, many, one } from '@mail/model/model_field';
 import { clear } from '@mail/model/model_field_command';
 
 import { auto_str_to_date } from 'web.time';
@@ -103,6 +103,12 @@ registerModel({
                 return !this.fileUploader;
             },
         }),
+        mailTemplateViews: many('MailTemplateView', {
+            compute() {
+                return this.activity.mailTemplates.map(mailTemplate => ({ mailTemplate }));
+            },
+            inverse: 'activityListViewItemOwner',
+        }),
         markDoneView: one('ActivityMarkDonePopoverContentView', {
             inverse: 'activityListViewItemOwner',
         }),
diff --git a/addons/mail/static/src/models/mail_template_view.js b/addons/mail/static/src/models/mail_template_view.js
index 847961792e1..a9fecab6d49 100644
--- a/addons/mail/static/src/models/mail_template_view.js
+++ b/addons/mail/static/src/models/mail_template_view.js
@@ -12,7 +12,10 @@ registerModel({
         onClickPreview(ev) {
             ev.stopPropagation();
             ev.preventDefault();
-            this.mailTemplate.preview(this.activityViewOwner.activity);
+            this.mailTemplate.preview(this.activity);
+            if (this.activityListViewItemOwner) {
+                this.activityListViewItemOwner.activityListViewOwner.popoverViewOwner.delete();
+            }
         },
         /**
          * @param {MouseEvent} ev
@@ -20,12 +23,27 @@ registerModel({
         onClickSend(ev) {
             ev.stopPropagation();
             ev.preventDefault();
-            this.mailTemplate.send(this.activityViewOwner.activity);
+            this.mailTemplate.send(this.activity);
+            if (this.activityListViewItemOwner) {
+                this.activityListViewItemOwner.activityListViewOwner.popoverViewOwner.delete();
+            }
         },
     },
     fields: {
+        activity: one('Activity', {
+            compute() {
+                if (this.activityViewOwner) {
+                    return this.activityViewOwner.activity;
+                }
+                if (this.activityListViewItemOwner) {
+                    return this.activityListViewItemOwner.activity;
+                }
+            }
+        }),
+        activityListViewItemOwner: one('ActivityListViewItem', {
+            inverse: 'mailTemplateViews',
+        }),
         activityViewOwner: one('ActivityView', {
-            identifying: true,
             inverse: 'mailTemplateViews',
         }),
         mailTemplate: one('MailTemplate', {