diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index f1618ce44d2..8ed809a6eab 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -3,15 +3,18 @@
     <data>
 
         <template id="follow">
-            <a href="#" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-follow="object.id and object.message_is_follower and 'on' or 'off'" class="pull-right js_follow" t-if="editable" t-ignore="true">
-                <span t-attf-class="label label-success css_follow">Follow</span>
-                <span t-attf-class="label label-danger css_unfollow">Unfollow</span>
-                <span t-attf-class="label label-success css_followed">Following</span>
-                <span t-attf-class="label label-danger css_unfollowed">Not Following</span>
-            </a>
-            <input type="email" name="email" class="js_follow_email css_unfollowed_email"
-                t-att-value="email"
-                t-att-placeholder="email or 'Email Address'"/>
+            <div name="follow">
+                <a href="#" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-follow="object.id and object.message_is_follower and 'on' or 'off'"
+                        class="pull-right js_follow" t-if="editable" t-ignore="true">
+                    <span t-attf-class="label label-success css_follow">Follow</span>
+                    <span t-attf-class="label label-danger css_unfollow">Unfollow</span>
+                    <span t-attf-class="label label-success css_followed">Following</span>
+                    <span t-attf-class="label label-danger css_unfollowed">Not Following</span>
+                </a>
+                <input type="email" name="email" class="js_follow_email css_unfollowed_email"
+                    t-att-value="email"
+                    t-att-placeholder="email or 'Email Address'"/>
+            </div>
         </template>
 
         <template id="website.layout" inherit_id="website.layout">