diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ccedc6aca2d..351e762c2f4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -27,11 +27,6 @@
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
                     <t t-call="mail.thread.list_recipients"/>
-                    <div class="oe_emails_from" t-if="widget.emails_from.length">
-                        <t t-foreach='widget.emails_from' t-as='email_from'>
-                            <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
-                        </t>
-                    </div>
                     <textarea class="field_text"></textarea>
                 </div>
                 <div class="oe_msg_footer">
@@ -119,6 +114,11 @@
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length || widget.author_id)"> and </t>
+            <t t-if="widget.author_id">
+                <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-if="widget.partner_ids.length" t-raw="', '"/>
+            </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,16 +126,16 @@
                     <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.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>
             </t>
         </div>
+        <div class="oe_emails_from" t-if="widget.emails_from.length">
+            <t t-foreach='widget.emails_from' t-as='email_from'>
+                <label><input type="checkbox" t-att-checked="email_from[1] ? 'checked' : undefind" t-att-data="email_from[0]"/> <t t-raw="email_from[0]"/></label>
+            </t>
+        </div>
     </t>
 
     <!--