diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 7ef14676c2a..7db1f3343df 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -6168,6 +6168,13 @@ msgstr ""
 msgid "Remove email from blacklist wizard"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/models/message_action_view.js:0
+#, python-format
+msgid "Remove from Todo"
+msgstr ""
+
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.email_template_form
 msgid "Remove the contextual action to use this template on related documents"
@@ -7810,6 +7817,13 @@ msgstr ""
 msgid "Upload Document"
 msgstr ""
 
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml:0
+#, python-format
+msgid "Upload File"
+msgstr ""
+
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/backend_components/activity_list_view_item/activity_list_view_item.xml:0
diff --git a/addons/mail/static/src/backend_components/activity_list_view/activity_list_view.xml b/addons/mail/static/src/backend_components/activity_list_view/activity_list_view.xml
index 9d63fb63290..b88217cce5d 100644
--- a/addons/mail/static/src/backend_components/activity_list_view/activity_list_view.xml
+++ b/addons/mail/static/src/backend_components/activity_list_view/activity_list_view.xml
@@ -35,6 +35,7 @@
                     <t t-foreach="activityListView.plannedActivityListViewItems" t-as="activityListViewItem" t-key="activityListViewItem">
                         <ActivityListViewItem record="activityListViewItem"/>
                     </t>
+                </t>
             </div>
             <button class="o_ActivityListView_addActivityButton btn btn-secondary p-3 text-center" t-on-click="activityListView.onClickAddActivityButton">
                 <i class="fa fa-plus fa-fw"></i><strong>Schedule an activity</strong>
diff --git a/addons/mail/static/src/models/message_action_view.js b/addons/mail/static/src/models/message_action_view.js
index 38bd136bde2..efecd79aaf7 100644
--- a/addons/mail/static/src/models/message_action_view.js
+++ b/addons/mail/static/src/models/message_action_view.js
@@ -175,6 +175,9 @@ registerModel({
                     case this.messageAction.messageActionListOwnerAsToggleCompact:
                         return this.env._t("Compact");
                     case this.messageAction.messageActionListOwnerAsToggleStar:
+                        if (this.messageAction.messageActionListOwner.message.isStarred) {
+                            return this.env._t("Remove from Todo");
+                        }
                         return this.env._t("Mark as Todo");
                     default:
                         return clear();