diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 75202fe99fd..196ad39dac8 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -509,10 +509,10 @@
                       class="js_follow_email form-control"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
-                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
+                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
                 </span>
-                <div class="alert alert-success hidden">Thanks for your subscription!</div>
+                <div class="alert alert-success hidden">thanks for your subscription!</div>
             </div>
 
         </div>
diff --git a/addons/website_mail_group/__openerp__.py b/addons/website_mail_group/__openerp__.py
index 9ea12329775..de47bfa4390 100644
--- a/addons/website_mail_group/__openerp__.py
+++ b/addons/website_mail_group/__openerp__.py
@@ -13,11 +13,10 @@ OpenERP Mail Group : Mailing List Archives
     'data': [
         'views/website_mail_group.xml',
         'data/website_mail_group_data.xml',
-        'security/website_mail_group.xml',
     ],
     'demo': [
         'data/website_mail_group_demo.xml'
     ],
-    'qweb': ['static/src/xml/*.xml'],
+    'qweb': [],
     'installable': True,
 }
diff --git a/addons/website_mail_group/security/ir.model.access.csv b/addons/website_mail_group/security/ir.model.access.csv
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/website_mail_group/security/website_mail_group.xml b/addons/website_mail_group/security/website_mail_group.xml
deleted file mode 100644
index 79d4390f6f9..00000000000
--- a/addons/website_mail_group/security/website_mail_group.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="ir.rule" id="mail.mail_group_public_and_joined">
-            <field name="name">Mail.group: access only public and joined groups</field>
-            <field name="model_id" ref="mail.model_mail_group"/>
-            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
-            <field name="perm_read" eval="False"/>
-            <field name="perm_create" eval="False"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.js b/addons/website_mail_group/static/src/js/website_mail_group.js
deleted file mode 100644
index 651ed7fa6c3..00000000000
--- a/addons/website_mail_group/static/src/js/website_mail_group.js
+++ /dev/null
@@ -1,28 +0,0 @@
-$(document).ready(function () {
-    $('a.js_group').on('click', function (ev) {
-        ev.preventDefault();
-        var $link = $(ev.currentTarget);
-        var href = $link.attr("href");
-        var group_id = href.match(/subscription\/([0-9]+)/)[1];
-        var action = href.match(/action=(.*)/)[1] == 'subscribe' ? true : false;
-        openerp.jsonRpc("/groups/subscription/", 'call', {
-                    'group_id': parseInt(group_id),
-                    'action' : action,
-                })
-                .then(function (data) {
-                    if(data[0])
-                        return window.location ='/web/login?redirect=/groups/';
-                    if (action){
-                        $('li#'+ group_id).toggleClass('hidden visible');
-                        $('.unfollow_' + group_id).toggleClass('visible hidden');
-                        $('.follow_' + group_id).toggleClass('hidden visible');
-                    }
-                    else {
-                        $('li#'+ group_id).toggleClass('visible hidden');
-                        $('.unfollow_' + group_id).toggleClass('hidden visible');
-                        $('.follow_' + group_id).toggleClass('visible hidden');
-                    }
-                });
-        return false;
-    });
-});
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index d1f960d7c00..9e4b41329b4 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -8,21 +8,32 @@
     </template>
     <template id="mail_groups" name="Mailing Lists">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
-            </t>
             <div class="container">
                 <h1>
                     Our Mailing Lists
                 </h1>
                 <div class="row">
-                    <div class="col-md-3 mt32 mb64" t-foreach="groups" t-as="group">
+                    <div class="col-sm-4" style="height: 140px" t-foreach="groups" t-as="group">
                         <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                         <div>
-                            <a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/>
+                            <strong><a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/></strong>
                             <div t-esc="group.description" class="text-muted"/>
-                            <a t-attf-class="btn btn-primary js_group #{group.message_is_follower and 'hidden' or 'visible'} follow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">Join Group</a>
-                            <a t-attf-class="btn btn-default js_group #{group.message_is_follower and 'visible' or 'hidden'} unfollow_#{group.id}" t-attf-href="/groups/subscription/#{ group.id }/?action=unsubscribe" t-attf-id="#{group.id}">Unsubscribe</a>
+
+                            <div class="input-group js_follow"
+                                      t-att-data-id="group.id"
+                                      data-object="mail.group"
+                                      data-follow="off">
+                                <input
+                                      type="email"
+                                      name="email"
+                                      class="js_follow_email form-control"
+                                      placeholder="your email..."/>
+                                <span class="input-group-btn">
+                                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                                </span>
+                                <div class="alert alert-success hidden">You have been subscribed!</div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -69,9 +80,6 @@
 
     <template id="group_message">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_mail_group/static/src/js/website_mail_group.js"></script>
-            </t>
             <div class="container">
                 <div class="row mt8">
                     <div class="col-md-5">
@@ -128,16 +136,24 @@
                         Join this mailing list to follow or participate to this discussion.<br/>
                         <span t-field="group.name"/>: <i t-field="group.description"/>
                     </p>
-                    <p>
-                        <span t-if="group.message_is_follower" t-attf-class="btn btn-default disabled">
-                            Already subscribed
-                        </span>
-                        <a t-if="not group.message_is_follower"
-                          t-attf-class="btn btn-primary btn-lg js_group follow_#{group.id}"
-                          t-attf-href="/groups/subscription/#{ group.id }/?action=subscribe" t-attf-id="#{group.id}">
-                            Join The List
-                        </a> or <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">view archives</a>
-                    </p>
+
+                    <div style="max-width: 400px">
+                        <div class="input-group js_follow"
+                                  t-att-data-id="group.id"
+                                  data-object="mail.group"
+                                  data-follow="off">
+                            <input
+                                  type="email"
+                                  name="email"
+                                  class="js_follow_email form-control"
+                                  placeholder="your email..."/>
+                            <span class="input-group-btn">
+                                <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
+                                <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                            </span>
+                            <div class="alert alert-success hidden">You have been subscribed!</div>
+                        </div>
+                    </div>
 
                 </div>
             </div>