diff --git a/mail_to/static/src/xml/recipient.xml b/mail_to/static/src/xml/recipient.xml
index 0e1b5290..ede8ecec 100644
--- a/mail_to/static/src/xml/recipient.xml
+++ b/mail_to/static/src/xml/recipient.xml
@@ -8,7 +8,7 @@
         <t t-jquery="p[class=o_mail_info] span:last" t-operation="after">
             <span class="recipients_info"><t t-if="message.partner_ids">
                 <t t-if="message.partner_ids.length > 0">To: </t>
-                <t t-else="message.channel_names.length > 0">To: </t>
+                <t t-else="message.channel_ids.length > 0">To: </t>
                 <t t-foreach="message.partner_ids.length" t-as="i">
                     <t t-if="i &lt; message.more_recipients_value">
                         <a t-att-href="_.str.sprintf('/web?#id=%s&amp;view_type=form&amp;model=res.partner', message.partner_ids[i][0])" class="recipient_link">
@@ -19,8 +19,8 @@
 
                 <t t-if="message.channel_names">
                     <t t-foreach="message.channel_ids.length" t-as="i">
-                        <t t-if="message.partner_ids.length &lt; 4  and (message.partner_ids.length + i) &lt; 4">
-                            <a t-att-href="_.str.sprintf('/web?#id=%s&amp;view_type=form&amp;model=mail.channel', message.channel_names[i][0])" class="recipient_link">
+                        <t t-if="message.partner_ids.length &lt; message.more_recipients_value  and (message.partner_ids.length + i) &lt; message.more_recipients_value">
+                            <a t-if="message.channel_names[i]" t-att-href="_.str.sprintf('/web?#id=%s&amp;view_type=form&amp;model=mail.channel', message.channel_names[i][0])" class="recipient_link">
                                 <i t-esc="message.channel_names[i][1]"/><t t-if="i &lt; message.channel_ids.length - 1">; </t>
                             </a>
                         </t>