diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index d0df8e6b5a1e059ae10ef3d273cac55fe59140af..b65a19b327118c98831c41c2c81f2412cce95dea 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -84,6 +84,14 @@
                                 <t t-set="object" t-value="message"/>
                                 <t t-call="website.publish_short"/>
                                 <div t-field="message.body"/>
+                                <div class="o_mg_link_content">
+                                    <div class="col-md-2 col-sm-3 text-center" t-foreach='message.attachment_ids' t-as='attachment'>
+                                        <a t-attf-href="/web/content/#{attachment.id}?download=true" target="_blank">
+                                            <div class='oe_attachment_embedded o_image' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80"/>
+                                            <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
+                                        </a>
+                                    </div>
+                                </div>
                             </div>
                             </div>
                         </li>