diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c3be27d8191..ccedc6aca2d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -118,7 +118,7 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
                 </span>
             </t>
-            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
+            <t t-if="!widget.is_private and (widget.partner_ids.length || widget.author_id)"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
                 <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
@@ -126,11 +126,11 @@
                     <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
                 </span><t t-set="inc" t-value="inc+1"/>
             </t>
-
-            <t t-if="widget.partner_ids.length and widget.author_id" t-raw="', '"/>
-            <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-raw="widget.author_id[1]"/></a>
-            <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
-
+            <t t-if="widget.author_id">
+                <t t-if="widget.partner_ids.length and widget.author_id" t-raw="', '"/>
+                <a t-if="widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                <span t-if="(!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[1]"/></span>
+            </t>
             <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>