diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 318a0f5860a..b14b5a5d3ce 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -128,10 +128,10 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
+            <t t-if="!widget.is_private and widget.is_author"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-foreach="widget.partner_ids" t-as="partner">
-                <t t-if="partner[0] != widget.author_id[0]">
-                    <t t-if="!widget.is_private"> and </t>
+                <t t-if="widget.is_private or (widget.is_author and widget.author_id[0] != partner[0])">
 	                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
 	                    <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
 	                    <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
@@ -139,6 +139,7 @@
 	                <t t-set="inc" t-value="inc+1"/>
                 </t>
             </t>
+             <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-if="!widget.is_author" t-raw="widget.author_id[2]"/></a>
             <t t-if="widget.partner_ids.length > 3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>