diff --git a/mail_optional_follower_notification/README.rst b/mail_optional_follower_notification/README.rst
index 93bacf1..cb910c6 100644
--- a/mail_optional_follower_notification/README.rst
+++ b/mail_optional_follower_notification/README.rst
@@ -14,13 +14,13 @@ Mail optional follower notification
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
-    :target: https://github.com/OCA/social/tree/12.0/mail_optional_follower_notification
+    :target: https://github.com/OCA/social/tree/13.0/mail_optional_follower_notification
     :alt: OCA/social
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_optional_follower_notification
+    :target: https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_optional_follower_notification
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/205/12.0
+    :target: https://runbot.odoo-community.org/runbot/205/13.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -42,10 +42,10 @@ document and" on mail.compose.message:
 
 This field it's initialized to true to keep the standard behavior.
 
-.. figure:: https://raw.githubusercontent.com/OCA/social/12.0/mail_optional_follower_notification/static/description/optional_follower_001.png
+.. figure:: https://raw.githubusercontent.com/OCA/social/13.0/mail_optional_follower_notification/static/description/optional_follower_001.png
    :alt: Default checkbox
 
-.. figure:: https://raw.githubusercontent.com/OCA/social/12.0/mail_optional_follower_notification/static/description/optional_follower_002.png
+.. figure:: https://raw.githubusercontent.com/OCA/social/13.0/mail_optional_follower_notification/static/description/optional_follower_002.png
    :alt: Checkbox to avoid to notify automatically followers
 
 Bug Tracker
@@ -54,7 +54,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_optional_follower_notification%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_optional_follower_notification%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -86,6 +86,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/social <https://github.com/OCA/social/tree/12.0/mail_optional_follower_notification>`_ project on GitHub.
+This module is part of the `OCA/social <https://github.com/OCA/social/tree/13.0/mail_optional_follower_notification>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mail_optional_follower_notification/__manifest__.py b/mail_optional_follower_notification/__manifest__.py
index f55cd4b..f7efcc7 100644
--- a/mail_optional_follower_notification/__manifest__.py
+++ b/mail_optional_follower_notification/__manifest__.py
@@ -6,7 +6,7 @@
     "author": "ACSONE SA/NV," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/social",
     "category": "Social Network",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.0.1",
     "license": "AGPL-3",
     "depends": ["mail"],
     "data": ["wizard/mail_compose_message_view.xml"],
diff --git a/mail_optional_follower_notification/i18n/am.po b/mail_optional_follower_notification/i18n/am.po
index 65c4e85..828feb3 100644
--- a/mail_optional_follower_notification/i18n/am.po
+++ b/mail_optional_follower_notification/i18n/am.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "ተባባሪ"
+#~ msgid "Partner"
+#~ msgstr "ተባባሪ"
diff --git a/mail_optional_follower_notification/i18n/ar.po b/mail_optional_follower_notification/i18n/ar.po
index 8c2eaf4..8384a07 100644
--- a/mail_optional_follower_notification/i18n/ar.po
+++ b/mail_optional_follower_notification/i18n/ar.po
@@ -20,12 +20,19 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "الشريك"
+#~ msgid "Partner"
+#~ msgstr "الشريك"
diff --git a/mail_optional_follower_notification/i18n/bg.po b/mail_optional_follower_notification/i18n/bg.po
index 6c9b215..8c63375 100644
--- a/mail_optional_follower_notification/i18n/bg.po
+++ b/mail_optional_follower_notification/i18n/bg.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Партньор"
+#~ msgid "Partner"
+#~ msgstr "Партньор"
diff --git a/mail_optional_follower_notification/i18n/bs.po b/mail_optional_follower_notification/i18n/bs.po
index 326a8d5..9a58aa3 100644
--- a/mail_optional_follower_notification/i18n/bs.po
+++ b/mail_optional_follower_notification/i18n/bs.po
@@ -20,12 +20,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/ca.po b/mail_optional_follower_notification/i18n/ca.po
index 5510920..bda5b6d 100644
--- a/mail_optional_follower_notification/i18n/ca.po
+++ b/mail_optional_follower_notification/i18n/ca.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,12 @@ msgid "Email composition wizard"
 msgstr "Assistent per composició de correus electrònics"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Missatge"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Message"
+#~ msgstr "Missatge"
+
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/cs.po b/mail_optional_follower_notification/i18n/cs.po
index 69b8151..5cd56f7 100644
--- a/mail_optional_follower_notification/i18n/cs.po
+++ b/mail_optional_follower_notification/i18n/cs.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Společník"
+#~ msgid "Partner"
+#~ msgstr "Společník"
diff --git a/mail_optional_follower_notification/i18n/da.po b/mail_optional_follower_notification/i18n/da.po
index 09f3120..73c083c 100644
--- a/mail_optional_follower_notification/i18n/da.po
+++ b/mail_optional_follower_notification/i18n/da.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/de.po b/mail_optional_follower_notification/i18n/de.po
index 6816047..5993f96 100644
--- a/mail_optional_follower_notification/i18n/de.po
+++ b/mail_optional_follower_notification/i18n/de.po
@@ -20,35 +20,39 @@ msgstr ""
 "X-Generator: Weblate 3.3\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
+#, fuzzy
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
 msgstr ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style=\""
-"color: red;\"> - Warnung : Abonnenten werden nicht benachrichtigt! Aber sie "
-"können die Benachrichtigung direkt über das Dokument einsehen (wenn sie "
+"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
+"\"color: red;\"> - Warnung : Abonnenten werden nicht benachrichtigt! Aber "
+"sie können die Benachrichtigung direkt über das Dokument einsehen (wenn sie "
 "berechtigt sind).</span>"
 
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
 #. module: mail_optional_follower_notification
 #: model:ir.model,name:mail_optional_follower_notification.model_mail_compose_message
 msgid "Email composition wizard"
 msgstr "Assistent zum Email verfassen"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Nachricht"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+#, fuzzy
+msgid "Notify Followers"
 msgstr "Abonnenten benachrichtigen"
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Nachricht"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/el_GR.po b/mail_optional_follower_notification/i18n/el_GR.po
index e06ce95..6720329 100644
--- a/mail_optional_follower_notification/i18n/el_GR.po
+++ b/mail_optional_follower_notification/i18n/el_GR.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Συνεργάτης"
+#~ msgid "Partner"
+#~ msgstr "Συνεργάτης"
diff --git a/mail_optional_follower_notification/i18n/en_GB.po b/mail_optional_follower_notification/i18n/en_GB.po
index 51d90a1..3cbb480 100644
--- a/mail_optional_follower_notification/i18n/en_GB.po
+++ b/mail_optional_follower_notification/i18n/en_GB.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/es.po b/mail_optional_follower_notification/i18n/es.po
index f66ef0f..46ffee7 100644
--- a/mail_optional_follower_notification/i18n/es.po
+++ b/mail_optional_follower_notification/i18n/es.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,12 @@ msgid "Email composition wizard"
 msgstr "Asistente composición Correo Electrónico"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Mensaje"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Message"
+#~ msgstr "Mensaje"
+
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/es_CO.po b/mail_optional_follower_notification/i18n/es_CO.po
index 7c70103..852116d 100644
--- a/mail_optional_follower_notification/i18n/es_CO.po
+++ b/mail_optional_follower_notification/i18n/es_CO.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr "Asistente de redacción de E-mail"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Mensaje"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr ""
+#~ msgid "Message"
+#~ msgstr "Mensaje"
diff --git a/mail_optional_follower_notification/i18n/es_CR.po b/mail_optional_follower_notification/i18n/es_CR.po
index 42985d3..0fb8f9b 100644
--- a/mail_optional_follower_notification/i18n/es_CR.po
+++ b/mail_optional_follower_notification/i18n/es_CR.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/es_EC.po b/mail_optional_follower_notification/i18n/es_EC.po
index 0ff5e12..67676d5 100644
--- a/mail_optional_follower_notification/i18n/es_EC.po
+++ b/mail_optional_follower_notification/i18n/es_EC.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/es_MX.po b/mail_optional_follower_notification/i18n/es_MX.po
index b952181..d7f738c 100644
--- a/mail_optional_follower_notification/i18n/es_MX.po
+++ b/mail_optional_follower_notification/i18n/es_MX.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/es_VE.po b/mail_optional_follower_notification/i18n/es_VE.po
index 50dc7c6..f6a5fd9 100644
--- a/mail_optional_follower_notification/i18n/es_VE.po
+++ b/mail_optional_follower_notification/i18n/es_VE.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/et.po b/mail_optional_follower_notification/i18n/et.po
index 765e4df..46032b3 100644
--- a/mail_optional_follower_notification/i18n/et.po
+++ b/mail_optional_follower_notification/i18n/et.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/eu.po b/mail_optional_follower_notification/i18n/eu.po
index 7c3327c..d6ceb28 100644
--- a/mail_optional_follower_notification/i18n/eu.po
+++ b/mail_optional_follower_notification/i18n/eu.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Kidea"
+#~ msgid "Partner"
+#~ msgstr "Kidea"
diff --git a/mail_optional_follower_notification/i18n/fi.po b/mail_optional_follower_notification/i18n/fi.po
index 2946b1e..fa4a41d 100644
--- a/mail_optional_follower_notification/i18n/fi.po
+++ b/mail_optional_follower_notification/i18n/fi.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Kumppani"
+#~ msgid "Partner"
+#~ msgstr "Kumppani"
diff --git a/mail_optional_follower_notification/i18n/fr.po b/mail_optional_follower_notification/i18n/fr.po
index 9a9b87a..cfdd55d 100644
--- a/mail_optional_follower_notification/i18n/fr.po
+++ b/mail_optional_follower_notification/i18n/fr.po
@@ -20,35 +20,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
+#, fuzzy
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
 msgstr ""
 "<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
 "\"color: red;\">- Attention : les abonnés ne seront pas notifié mais ils "
 "peuvent avoir accès à la notification directement depuis le document (si ils "
 "sont autorisés à le faire) </span>"
 
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
 #. module: mail_optional_follower_notification
 #: model:ir.model,name:mail_optional_follower_notification.model_mail_compose_message
 msgid "Email composition wizard"
 msgstr "Assistant de composition de courriel"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Message"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+#, fuzzy
+msgid "Notify Followers"
 msgstr "Notifier les abonnés"
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#~ msgid "Message"
+#~ msgstr "Message"
+
+#~ msgid "Partner"
+#~ msgstr "Partenaire"
diff --git a/mail_optional_follower_notification/i18n/fr_CA.po b/mail_optional_follower_notification/i18n/fr_CA.po
index 34c6c9f..0192985 100644
--- a/mail_optional_follower_notification/i18n/fr_CA.po
+++ b/mail_optional_follower_notification/i18n/fr_CA.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#~ msgid "Partner"
+#~ msgstr "Partenaire"
diff --git a/mail_optional_follower_notification/i18n/fr_CH.po b/mail_optional_follower_notification/i18n/fr_CH.po
index 446c4fb..d237905 100644
--- a/mail_optional_follower_notification/i18n/fr_CH.po
+++ b/mail_optional_follower_notification/i18n/fr_CH.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#~ msgid "Partner"
+#~ msgstr "Partenaire"
diff --git a/mail_optional_follower_notification/i18n/gl.po b/mail_optional_follower_notification/i18n/gl.po
index 500f8e6..07d626a 100644
--- a/mail_optional_follower_notification/i18n/gl.po
+++ b/mail_optional_follower_notification/i18n/gl.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Empresa"
+#~ msgid "Partner"
+#~ msgstr "Empresa"
diff --git a/mail_optional_follower_notification/i18n/hr.po b/mail_optional_follower_notification/i18n/hr.po
index ccb4ceb..8e9a93a 100644
--- a/mail_optional_follower_notification/i18n/hr.po
+++ b/mail_optional_follower_notification/i18n/hr.po
@@ -21,12 +21,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -35,17 +42,12 @@ msgid "Email composition wizard"
 msgstr "Čarobnjak za sastavljanje maila"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Poruka"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Poruka"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/hr_HR.po b/mail_optional_follower_notification/i18n/hr_HR.po
index dc5f867..a5176c5 100644
--- a/mail_optional_follower_notification/i18n/hr_HR.po
+++ b/mail_optional_follower_notification/i18n/hr_HR.po
@@ -21,12 +21,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -35,17 +42,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/hu.po b/mail_optional_follower_notification/i18n/hu.po
index 2bdff7b..5f6dd89 100644
--- a/mail_optional_follower_notification/i18n/hu.po
+++ b/mail_optional_follower_notification/i18n/hu.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/it.po b/mail_optional_follower_notification/i18n/it.po
index 1e900ee..be94901 100644
--- a/mail_optional_follower_notification/i18n/it.po
+++ b/mail_optional_follower_notification/i18n/it.po
@@ -20,35 +20,39 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
+#, fuzzy
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
 msgstr ""
 "<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
 "\"color: red;\"> - Attenzione: i follower non verranno notificati ma "
 "potranno accedere accedere alle notifiche direttamente dal documento (se "
 "autorizzati)</span>"
 
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
 #. module: mail_optional_follower_notification
 #: model:ir.model,name:mail_optional_follower_notification.model_mail_compose_message
 msgid "Email composition wizard"
 msgstr "Wizard Creazione Email"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Messaggio"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+#, fuzzy
+msgid "Notify Followers"
 msgstr "Notifica Follower"
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Messaggio"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/ja.po b/mail_optional_follower_notification/i18n/ja.po
index d484ec2..75196f9 100644
--- a/mail_optional_follower_notification/i18n/ja.po
+++ b/mail_optional_follower_notification/i18n/ja.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "パートナ"
+#~ msgid "Partner"
+#~ msgstr "パートナ"
diff --git a/mail_optional_follower_notification/i18n/lt.po b/mail_optional_follower_notification/i18n/lt.po
index 982ce7e..5411c18 100644
--- a/mail_optional_follower_notification/i18n/lt.po
+++ b/mail_optional_follower_notification/i18n/lt.po
@@ -20,12 +20,19 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partneris"
+#~ msgid "Partner"
+#~ msgstr "Partneris"
diff --git a/mail_optional_follower_notification/i18n/lv.po b/mail_optional_follower_notification/i18n/lv.po
index e6bb37d..9aab605 100644
--- a/mail_optional_follower_notification/i18n/lv.po
+++ b/mail_optional_follower_notification/i18n/lv.po
@@ -20,12 +20,19 @@ msgstr ""
 "2);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partneris"
+#~ msgid "Partner"
+#~ msgstr "Partneris"
diff --git a/mail_optional_follower_notification/i18n/mail_optional_follower_notification.pot b/mail_optional_follower_notification/i18n/mail_optional_follower_notification.pot
index 15746f4..e342354 100644
--- a/mail_optional_follower_notification/i18n/mail_optional_follower_notification.pot
+++ b/mail_optional_follower_notification/i18n/mail_optional_follower_notification.pot
@@ -1,12 +1,12 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* mail_optional_follower_notification
+# 	* mail_optional_follower_notification
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 12.0\n"
+"Project-Id-Version: Odoo Server 13.0\n"
 "Report-Msgid-Bugs-To: \n"
-"Last-Translator: <>\n"
+"Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,12 +15,15 @@ msgstr ""
 
 #. module: mail_optional_follower_notification
 #: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
-msgid "<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : Followers will not be notified but they can access the notification directly from the document (if they are allowed to)</span>"
+msgid ""
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : Followers will not be notified but they can access the notification directly from the document (if they are allowed to)</span>\n"
+"            </span>"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Contact"
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -28,13 +31,7 @@ msgstr ""
 msgid "Email composition wizard"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr ""
-
 #. module: mail_optional_follower_notification
 #: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
 msgid "Notify Followers"
 msgstr ""
-
diff --git a/mail_optional_follower_notification/i18n/mk.po b/mail_optional_follower_notification/i18n/mk.po
index 1e38937..87c53e8 100644
--- a/mail_optional_follower_notification/i18n/mk.po
+++ b/mail_optional_follower_notification/i18n/mk.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Партнер"
+#~ msgid "Partner"
+#~ msgstr "Партнер"
diff --git a/mail_optional_follower_notification/i18n/mn.po b/mail_optional_follower_notification/i18n/mn.po
index fbfa5d9..140daf3 100644
--- a/mail_optional_follower_notification/i18n/mn.po
+++ b/mail_optional_follower_notification/i18n/mn.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Харилцагч"
+#~ msgid "Partner"
+#~ msgstr "Харилцагч"
diff --git a/mail_optional_follower_notification/i18n/nb.po b/mail_optional_follower_notification/i18n/nb.po
index 9ed4faa..37aa465 100644
--- a/mail_optional_follower_notification/i18n/nb.po
+++ b/mail_optional_follower_notification/i18n/nb.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,12 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Melding"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Melding"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/nb_NO.po b/mail_optional_follower_notification/i18n/nb_NO.po
index bba3666..d63278f 100644
--- a/mail_optional_follower_notification/i18n/nb_NO.po
+++ b/mail_optional_follower_notification/i18n/nb_NO.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/nl.po b/mail_optional_follower_notification/i18n/nl.po
index b9e417b..18a60d9 100644
--- a/mail_optional_follower_notification/i18n/nl.po
+++ b/mail_optional_follower_notification/i18n/nl.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,12 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Bericht"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Bericht"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/nl_BE.po b/mail_optional_follower_notification/i18n/nl_BE.po
index cf0ecce..a033fe8 100644
--- a/mail_optional_follower_notification/i18n/nl_BE.po
+++ b/mail_optional_follower_notification/i18n/nl_BE.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Relatie"
+#~ msgid "Partner"
+#~ msgstr "Relatie"
diff --git a/mail_optional_follower_notification/i18n/nl_NL.po b/mail_optional_follower_notification/i18n/nl_NL.po
index 2ba2d07..8c188ea 100644
--- a/mail_optional_follower_notification/i18n/nl_NL.po
+++ b/mail_optional_follower_notification/i18n/nl_NL.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,12 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Bericht"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Bericht"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/pl.po b/mail_optional_follower_notification/i18n/pl.po
index 9f2abc3..01ba891 100644
--- a/mail_optional_follower_notification/i18n/pl.po
+++ b/mail_optional_follower_notification/i18n/pl.po
@@ -21,12 +21,19 @@ msgstr ""
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -35,17 +42,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/pt.po b/mail_optional_follower_notification/i18n/pt.po
index 6297290..1a06275 100644
--- a/mail_optional_follower_notification/i18n/pt.po
+++ b/mail_optional_follower_notification/i18n/pt.po
@@ -21,35 +21,39 @@ msgstr ""
 "X-Generator: Weblate 3.7.1\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
+#, fuzzy
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
 msgstr ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style=\""
-"color: red;\"> - Aviso: os seguidores não serão notificados mas poderão "
+"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
+"\"color: red;\"> - Aviso: os seguidores não serão notificados mas poderão "
 "aceder à notificação diretamente a partir do documento (se para isso tiverem "
 "permissão)</span>"
 
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
 #. module: mail_optional_follower_notification
 #: model:ir.model,name:mail_optional_follower_notification.model_mail_compose_message
 msgid "Email composition wizard"
 msgstr "Assistente de composição de email"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Mensagem"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+#, fuzzy
+msgid "Notify Followers"
 msgstr "Notificar seguidores"
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#~ msgid "Message"
+#~ msgstr "Mensagem"
+
+#~ msgid "Partner"
+#~ msgstr "Parceiro"
diff --git a/mail_optional_follower_notification/i18n/pt_BR.po b/mail_optional_follower_notification/i18n/pt_BR.po
index 8b2a106..4daf20c 100644
--- a/mail_optional_follower_notification/i18n/pt_BR.po
+++ b/mail_optional_follower_notification/i18n/pt_BR.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,12 @@ msgid "Email composition wizard"
 msgstr "Assistente de Composição de Email"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Mensagem"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#~ msgid "Message"
+#~ msgstr "Mensagem"
+
+#~ msgid "Partner"
+#~ msgstr "Parceiro"
diff --git a/mail_optional_follower_notification/i18n/pt_PT.po b/mail_optional_follower_notification/i18n/pt_PT.po
index d5c2c43..f244538 100644
--- a/mail_optional_follower_notification/i18n/pt_PT.po
+++ b/mail_optional_follower_notification/i18n/pt_PT.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Parceiro"
+#~ msgid "Partner"
+#~ msgstr "Parceiro"
diff --git a/mail_optional_follower_notification/i18n/ro.po b/mail_optional_follower_notification/i18n/ro.po
index 1824ca1..6bdc574 100644
--- a/mail_optional_follower_notification/i18n/ro.po
+++ b/mail_optional_follower_notification/i18n/ro.po
@@ -20,12 +20,19 @@ msgstr ""
 "2:1));\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partener"
+#~ msgid "Partner"
+#~ msgstr "Partener"
diff --git a/mail_optional_follower_notification/i18n/ru.po b/mail_optional_follower_notification/i18n/ru.po
index 0acb420..e69dd56 100644
--- a/mail_optional_follower_notification/i18n/ru.po
+++ b/mail_optional_follower_notification/i18n/ru.po
@@ -21,12 +21,19 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -35,17 +42,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Контрагент"
+#~ msgid "Partner"
+#~ msgstr "Контрагент"
diff --git a/mail_optional_follower_notification/i18n/sk.po b/mail_optional_follower_notification/i18n/sk.po
index 0134375..7f3ca5c 100644
--- a/mail_optional_follower_notification/i18n/sk.po
+++ b/mail_optional_follower_notification/i18n/sk.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/sl.po b/mail_optional_follower_notification/i18n/sl.po
index f76bd11..8a99713 100644
--- a/mail_optional_follower_notification/i18n/sl.po
+++ b/mail_optional_follower_notification/i18n/sl.po
@@ -20,12 +20,19 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,13 @@ msgid "Email composition wizard"
 msgstr "Čarovnik za sestavljanje e-pošte"
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "Sporočilo"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+#, fuzzy
+msgid "Notify Followers"
 msgstr "Obvesti sledilce"
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Message"
+#~ msgstr "Sporočilo"
+
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/sr@latin.po b/mail_optional_follower_notification/i18n/sr@latin.po
index 57756a6..f4c995f 100644
--- a/mail_optional_follower_notification/i18n/sr@latin.po
+++ b/mail_optional_follower_notification/i18n/sr@latin.po
@@ -21,12 +21,19 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -35,17 +42,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Partner"
+#~ msgid "Partner"
+#~ msgstr "Partner"
diff --git a/mail_optional_follower_notification/i18n/sv.po b/mail_optional_follower_notification/i18n/sv.po
index 2dfcb75..00d6769 100644
--- a/mail_optional_follower_notification/i18n/sv.po
+++ b/mail_optional_follower_notification/i18n/sv.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Företag"
+#~ msgid "Partner"
+#~ msgstr "Företag"
diff --git a/mail_optional_follower_notification/i18n/th.po b/mail_optional_follower_notification/i18n/th.po
index e5b7d63..3923fd4 100644
--- a/mail_optional_follower_notification/i18n/th.po
+++ b/mail_optional_follower_notification/i18n/th.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "พาร์ทเนอร์"
+#~ msgid "Partner"
+#~ msgstr "พาร์ทเนอร์"
diff --git a/mail_optional_follower_notification/i18n/tr.po b/mail_optional_follower_notification/i18n/tr.po
index 467160f..549db07 100644
--- a/mail_optional_follower_notification/i18n/tr.po
+++ b/mail_optional_follower_notification/i18n/tr.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,12 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "İleti"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "İş Ortağı"
+#~ msgid "Message"
+#~ msgstr "İleti"
+
+#~ msgid "Partner"
+#~ msgstr "İş Ortağı"
diff --git a/mail_optional_follower_notification/i18n/tr_TR.po b/mail_optional_follower_notification/i18n/tr_TR.po
index f5ff456..8e507d5 100644
--- a/mail_optional_follower_notification/i18n/tr_TR.po
+++ b/mail_optional_follower_notification/i18n/tr_TR.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,12 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
-msgstr "İleti"
-
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Ortak"
+#~ msgid "Message"
+#~ msgstr "İleti"
+
+#~ msgid "Partner"
+#~ msgstr "Ortak"
diff --git a/mail_optional_follower_notification/i18n/vi.po b/mail_optional_follower_notification/i18n/vi.po
index f4036cb..22267ae 100644
--- a/mail_optional_follower_notification/i18n/vi.po
+++ b/mail_optional_follower_notification/i18n/vi.po
@@ -19,12 +19,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -33,17 +40,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "Đối tác"
+#~ msgid "Partner"
+#~ msgstr "Đối tác"
diff --git a/mail_optional_follower_notification/i18n/zh_CN.po b/mail_optional_follower_notification/i18n/zh_CN.po
index d6d9864..09eeca9 100644
--- a/mail_optional_follower_notification/i18n/zh_CN.po
+++ b/mail_optional_follower_notification/i18n/zh_CN.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "业务伙伴"
+#~ msgid "Partner"
+#~ msgstr "业务伙伴"
diff --git a/mail_optional_follower_notification/i18n/zh_TW.po b/mail_optional_follower_notification/i18n/zh_TW.po
index 526b947..685f2c3 100644
--- a/mail_optional_follower_notification/i18n/zh_TW.po
+++ b/mail_optional_follower_notification/i18n/zh_TW.po
@@ -20,12 +20,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: mail_optional_follower_notification
-#: model:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_inherit_form
+#: model_terms:ir.ui.view,arch_db:mail_optional_follower_notification.email_compose_message_wizard_form
 msgid ""
-"<span attrs=\"{'invisible': [('notify_followers', '=', True)]}\" style="
-"\"color: red;\"> - Warning : Followers will not be notified but they can "
-"access the notification directly from the document (if they are allowed to)</"
-"span>"
+"<span name=\"document_followers_text\" position=\"after\">\n"
+"                <span name=\"no_followers_text\" attrs=\"{'invisible': "
+"[('notify_followers', '=', True)]}\" style=\"color: red;\"> - Warning : "
+"Followers will not be notified but they can access the notification directly "
+"from the document (if they are allowed to)</span>\n"
+"            </span>"
+msgstr ""
+
+#. module: mail_optional_follower_notification
+#: model:ir.model,name:mail_optional_follower_notification.model_mail_thread
+msgid "Email Thread"
 msgstr ""
 
 #. module: mail_optional_follower_notification
@@ -34,17 +41,9 @@ msgid "Email composition wizard"
 msgstr ""
 
 #. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_mail_message
-msgid "Message"
+#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message__notify_followers
+msgid "Notify Followers"
 msgstr ""
 
-#. module: mail_optional_follower_notification
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_compose_message_notify_followers
-#: model:ir.model.fields,field_description:mail_optional_follower_notification.field_mail_forward_compose_message_notify_followers
-msgid "Notify followers"
-msgstr ""
-
-#. module: mail_optional_follower_notification
-#: model:ir.model,name:mail_optional_follower_notification.model_res_partner
-msgid "Partner"
-msgstr "夥伴"
+#~ msgid "Partner"
+#~ msgstr "夥伴"
diff --git a/mail_optional_follower_notification/models/mail_thread.py b/mail_optional_follower_notification/models/mail_thread.py
index db9dd9a..1a675f7 100644
--- a/mail_optional_follower_notification/models/mail_thread.py
+++ b/mail_optional_follower_notification/models/mail_thread.py
@@ -11,7 +11,9 @@ class MailThread(models.AbstractModel):
         """ Compute recipients to notify based on subtype and followers. This
         method returns data structured as expected for ``_notify_recipients``. """
         recipient_data = super()._notify_compute_recipients(message, msg_vals)
-        if not self.env.context.get("notify_followers", False):
+        if "notify_followers" in self.env.context and not self.env.context.get(
+            "notify_followers", False
+        ):
             # filter out all the followers
             pids = (
                 msg_vals.get("partner_ids", [])
diff --git a/mail_optional_follower_notification/static/description/index.html b/mail_optional_follower_notification/static/description/index.html
index dd90ad2..326b758 100644
--- a/mail_optional_follower_notification/static/description/index.html
+++ b/mail_optional_follower_notification/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mail_optional_follower_notification"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-12-0/social-12-0-mail_optional_follower_notification"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/social/tree/13.0/mail_optional_follower_notification"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/social-13-0/social-13-0-mail_optional_follower_notification"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/205/13.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the possibility to choose if you want to automatically
 notify followers on mail.compose.message. By default, Odoo notify
 automatically all followers.</p>
@@ -390,10 +390,10 @@ automatically all followers.</p>
 document and” on mail.compose.message:</p>
 <p>This field it’s initialized to true to keep the standard behavior.</p>
 <div class="figure">
-<img alt="Default checkbox" src="https://raw.githubusercontent.com/OCA/social/12.0/mail_optional_follower_notification/static/description/optional_follower_001.png" />
+<img alt="Default checkbox" src="https://raw.githubusercontent.com/OCA/social/13.0/mail_optional_follower_notification/static/description/optional_follower_001.png" />
 </div>
 <div class="figure">
-<img alt="Checkbox to avoid to notify automatically followers" src="https://raw.githubusercontent.com/OCA/social/12.0/mail_optional_follower_notification/static/description/optional_follower_002.png" />
+<img alt="Checkbox to avoid to notify automatically followers" src="https://raw.githubusercontent.com/OCA/social/13.0/mail_optional_follower_notification/static/description/optional_follower_002.png" />
 </div>
 </div>
 <div class="section" id="bug-tracker">
@@ -401,7 +401,7 @@ document and” on mail.compose.message:</p>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_optional_follower_notification%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_optional_follower_notification%0Aversion:%2013.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -427,7 +427,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/12.0/mail_optional_follower_notification">OCA/social</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/13.0/mail_optional_follower_notification">OCA/social</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>