diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 0301484afec..db7ac54263a 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -35,17 +35,20 @@
     'data': [
         'mail_data.xml',
         'mass_mailing_view.xml',
-        'mass_mailing_demo.xml',
         'wizard/mail_compose_message_view.xml',
         'wizard/mail_mass_mailing_create_segment.xml',
         'security/ir.model.access.csv',
     ],
-    'js': [],
+    'js': [
+        'static/src/js/mass_mailing.js',
+    ],
     'qweb': [],
     'css': [
         'static/src/css/mass_mailing.css'
     ],
-    'demo': [],
+    'demo': [
+        'mass_mailing_demo.xml',
+    ],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index bdb1c12e016..f7443c896e3 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -2,123 +2,25 @@
 <openerp>
     <data>
 
-        <!--  MASS MAILING CAMPAIGNS !-->
-        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_tree">
-            <field name="name">mail.mass_mailing.campaign.tree</field>
-            <field name="model">mail.mass_mailing.campaign</field>
-            <field name="priority">10</field>
-            <field name="arch" type="xml">
-                <tree string="Mass Mailing Campaigns">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_form">
-            <field name="name">mail.mass_mailing.campaign.form</field>
-            <field name="model">mail.mass_mailing.campaign</field>
-            <field name="arch" type="xml">
-                <form string="Mass Mailing Campaign" version="7.0">
-                    <header>
-                        <button name="launch_mass_mailing_create_wizard" type="object"
-                            class="oe_highlight" string="Create a New Mailing"/>
-                    </header>
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="user_id"/>
-                        </group>
-                        <group>
-                            <group>
-                                <field name="sent"/>
-                                <field name="opened"/>
-                                <field name="bounced"/>
-                            </group>
-                            <group>
-                                <field name="delivered"/>
-                                <field name="replied"/>
-                            </group>
-                        </group>
-                        <group>
-                            <field name="mass_mailing_ids"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_kanban">
-            <field name="name">mail.mass_mailing.campaign.kanban</field>
-            <field name="model">mail.mass_mailing.campaign</field>
-            <field name="arch" type="xml">
-                <kanban>
-                    <field name="mass_mailing_kanban_ids"/>
-                    <field name='sent'/>
-                    <field name='color'/>
-                    <templates>
-                        <t t-name="mass_mailing.mass_mailing">
-                            <div>
-                                <h4><t t-raw="mass_mailing.name"/></h4>
-                            </div>
-                            <div>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.sent"/></span><br />
-                                    Sent
-                                </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.delivered"/></span><br />
-                                    Delivered
-                                </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.opened"/></span><br />
-                                    Opened
-                                </p>
-                                <p class="oe_mail_stats">
-                                    <span class="oe_mail_result"><t t-raw="mass_mailing.replied"/></span><br />
-                                    Replied
-                                </p>
-                            </div>
-                        </t>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                    <span class="oe_e">i</span>
-                                    <ul class="oe_dropdown_menu">
-                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                    </ul>
-                                </div>
-                                 <div class="oe_kanban_content">
-                                    <h3>
-                                        <field name="name"/>
-                                    </h3>
-                                    <div>
-                                        <field name="delivered" widget="gauge" style="width:160px; height: 120px;"
-                                            options="{'max_field': 'sent'}"/>
-                                        <field name="opened" widget="gauge" style="width:160px; height: 120px;"
-                                            options="{'max_field': 'sent'}"/>
-                                        <field name="replied" widget="gauge" style="width:160px; height: 120px;"
-                                            options="{'max_field': 'sent'}"/>
-                                    </div>
-                                    <t t-foreach='record.mass_mailing_kanban_ids.value' t-as='mass_mailing'>
-                                        <t t-call="mass_mailing.mass_mailing"/>
-                                    </t>
-                                </div>
-                                <div class="oe_clear"></div>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="action_view_mass_mailing_campaigns" model="ir.actions.act_window">
-            <field name="name">Mass Mailing Campaigns</field>
-            <field name="res_model">mail.mass_mailing.campaign</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,form</field>
-        </record>
-
         <!--  MASS MAILING !-->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_search">
+            <field name="name">mail.mass_mailing.search</field>
+            <field name="model">mail.mass_mailing</field>
+            <field name="arch" type="xml">
+               <search string="Mass Mailings">
+                    <field name="name" string="Mailings"/>
+                    <field name="mass_mailing_campaign_id"/>
+                    <field name="template_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Campaign" name="group_mass_mailing_campaign_id"
+                            context="{'group_by': 'mass_mailing_campaign_id'}"/>
+                        <filter string="Template" name="group_template_id"
+                            context="{'group_by': 'template_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_mail_mass_mailing_tree">
             <field name="name">mail.mass_mailing.tree</field>
             <field name="model">mail.mass_mailing</field>
@@ -130,6 +32,8 @@
                     <field name="delivered"/>
                     <field name="opened"/>
                     <field name="replied"/>
+                    <field name="mass_mailing_campaign_id" invisible="1"/>
+                    <field name="template_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -233,7 +137,166 @@
             <field name="view_mode">kanban,tree,form</field>
         </record>
 
+        <record id="action_view_mass_mailings_from_campaign" model="ir.actions.act_window">
+            <field name="name">Mass Mailings</field>
+            <field name="res_model">mail.mass_mailing</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{
+                'search_default_mass_mailing_campaign_id': [active_id], 
+                'default_mass_mailing_campaign_id': active_id,
+            }
+            </field>
+        </record>
+
+        <!--  MASS MAILING CAMPAIGNS !-->
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_search">
+            <field name="name">mail.mass_mailing.campaign.search</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+               <search string="Mass Mailing Campaigns">
+                    <field name="name" string="Campaigns"/>
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Responsibles" name="group_user_id"
+                            context="{'group_by': 'user_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_tree">
+            <field name="name">mail.mass_mailing.campaign.tree</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <tree string="Mass Mailing Campaigns">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_form">
+            <field name="name">mail.mass_mailing.campaign.form</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+                <form string="Mass Mailing Campaign" version="7.0">
+                    <header>
+                        <button name="launch_mass_mailing_create_wizard" type="object"
+                            class="oe_highlight" string="Create a New Mailing"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_id"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="sent"/>
+                                <field name="opened"/>
+                                <field name="bounced"/>
+                            </group>
+                            <group>
+                                <field name="delivered"/>
+                                <field name="replied"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="mass_mailing_ids"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_kanban">
+            <field name="name">mail.mass_mailing.campaign.kanban</field>
+            <field name="model">mail.mass_mailing.campaign</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="mass_mailing_kanban_ids"/>
+                    <field name='sent'/>
+                    <field name='color'/>
+                    <templates>
+                        <t t-name="mass_mailing.mass_mailing">
+                            <div class="oe_mass_mailings">
+                                <div>
+                                    <a name="%(action_view_mass_mailings_from_campaign)d" type="action">
+                                        <h4><t t-raw="mass_mailing.name"/></h4>
+                                    </a>
+                                </div>
+                                <div>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.sent"/></span><br />
+                                        Sent
+                                    </p>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.delivered"/></span><br />
+                                        Delivered
+                                    </p>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.opened"/></span><br />
+                                        Opened
+                                    </p>
+                                    <p class="oe_mail_stats">
+                                        <span class="oe_mail_result"><t t-raw="mass_mailing.replied"/></span><br />
+                                        Replied
+                                    </p>
+                                </div>
+                            </div>
+                        </t>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_mass_mailing oe_kanban_mass_mailing_campaign">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">i</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                 <div class="oe_kanban_content">
+                                    <h3>
+                                        <field name="name"/>
+                                    </h3>
+                                    <div>
+                                        <field name="delivered" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                        <field name="opened" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                        <field name="replied" widget="gauge" style="width:160px; height: 120px;"
+                                            options="{'max_field': 'sent'}"/>
+                                    </div>
+                                    <t t-foreach='record.mass_mailing_kanban_ids.value' t-as='mass_mailing'>
+                                        <t t-call="mass_mailing.mass_mailing"/>
+                                    </t>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="action_view_mass_mailing_campaigns" model="ir.actions.act_window">
+            <field name="name">Mass Mailing Campaigns</field>
+            <field name="res_model">mail.mass_mailing.campaign</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+        </record>
+
         <!--  MAIL MAIL STATISTICS !-->
+        <record model="ir.ui.view" id="view_mail_mail_statistics_search">
+            <field name="name">mail.mail.statistics.search</field>
+            <field name="model">mail.mail.statistics</field>
+            <field name="arch" type="xml">
+               <search string="Mail Statistics">
+                    <field name="mail_mail_id"/>
+                    <field name="message_id"/>
+                </search>
+            </field>
+        </record>
+
         <record model="ir.ui.view" id="view_mail_mail_statistics_tree">
             <field name="name">mail.mail.statistics.tree</field>
             <field name="model">mail.mail.statistics</field>
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
new file mode 100644
index 00000000000..93f63f01ad1
--- /dev/null
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -0,0 +1,13 @@
+openerp.mass_mailing = function(openerp) {
+
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function (event) {
+            if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
+                this.$('.oe_mass_mailings a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        },
+    });
+
+};