diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 73d14653cf6..403ab0efd4a 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -27,6 +27,9 @@ professional emails and reuse templates in a few clicks.
         'wizard/mail_compose_message_views.xml',
         'wizard/test_mailing_views.xml',
         'views/mass_mailing_report_views.xml',
+        'views/mass_mailing_stats_views.xml',
+        'views/link_tracker_views.xml',
+        'views/mass_mailing_template.xml',
         'views/mass_mailing_views.xml',
         'views/res_config_views.xml',
         'views/email_template.xml',
@@ -36,11 +39,8 @@ professional emails and reuse templates in a few clicks.
         'views/snippets_themes_options.xml',
         'views/theme_list.xml',
     ],
-    'qweb': [],
     'demo': [
         'data/mass_mailing_demo.xml',
     ],
-    'installable': True,
-    'auto_install': False,
     'application': True,
 }
diff --git a/addons/mass_mailing/data/mail_data.xml b/addons/mass_mailing/data/mail_data.xml
index a1a0e404fe3..f8ebe1dbce4 100644
--- a/addons/mass_mailing/data/mail_data.xml
+++ b/addons/mass_mailing/data/mail_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
 
         <!-- Bounce Email Alias -->
@@ -9,4 +9,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml
index 6cb326ab9a4..2e165a52806 100644
--- a/addons/mass_mailing/data/mass_mailing_data.xml
+++ b/addons/mass_mailing/data/mass_mailing_data.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
+<odoo>
     <data noupdate="1">
 
-        <!-- Group to manage campaigns -->
-        <record id="group_mass_mailing_campaign" model="res.groups">
-            <field name="name">Manage Mass Mailing Campaigns</field>
-            <field name="category_id" ref="base.module_category_hidden"/>
-        </record>
-
         <!-- Default stages of mass mailing campaigns -->
         <record id="campaign_stage_1" model="mail.mass_mailing.stage">
             <field name="name">Schedule</field>
@@ -28,4 +22,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</odoo>
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 0a2ac691a0a..7dff05d23ff 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-<openerp>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
     <data noupdate="1">
 
         <record id="mass_mail_attach_1" model="ir.attachment">
@@ -116,4 +116,4 @@
         </record>
 
     </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/security/mass_mailing_security.xml b/addons/mass_mailing/security/mass_mailing_security.xml
index 4bf1a45ba82..d1a10cda344 100644
--- a/addons/mass_mailing/security/mass_mailing_security.xml
+++ b/addons/mass_mailing/security/mass_mailing_security.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-
     <record id="group_mass_mailing_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_mass_mailing"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
-
+    
     <record id="base.default_user" model="res.users">
         <field name="groups_id" eval="[(4,ref('mass_mailing.group_mass_mailing_user'))]"/>
     </record>
@@ -17,4 +16,9 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-</odoo>
\ No newline at end of file
+    <!-- Group to manage campaigns -->
+    <record id="group_mass_mailing_campaign" model="res.groups">
+        <field name="name">Manage Mass Mailing Campaigns</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+</odoo>
diff --git a/addons/mass_mailing/views/email_template.xml b/addons/mass_mailing/views/email_template.xml
index afa0d1eafd1..b8bef566d72 100644
--- a/addons/mass_mailing/views/email_template.xml
+++ b/addons/mass_mailing/views/email_template.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
         <!-- Email Templates -->
         <record model="ir.ui.view" id="email_template_form_minimal">
             <field name="name">email.template.form.minimal</field>
@@ -97,6 +95,4 @@
         <menuitem name="Mail Templates" id="menu_email_template"
             parent="menu_mass_mailing_configuration" sequence="3"
             action="action_email_template_marketing" groups="mass_mailing.group_mass_mailing_user"/>
-
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/views/link_tracker_views.xml b/addons/mass_mailing/views/link_tracker_views.xml
new file mode 100644
index 00000000000..724f08cc8a4
--- /dev/null
+++ b/addons/mass_mailing/views/link_tracker_views.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+	<!-- LINK TRACKER VIEWS -->
+    <record model="ir.ui.view" id="view_mail_mass_mailing_links_tree">
+        <field name="name">link.tracker.tree</field>
+        <field name="model">link.tracker</field>
+        <field name="priority">10</field>
+        <field name="arch" type="xml">
+            <tree string="Mailing Statistics of Clicks">
+                <field name="title"/>
+                <field name="url"/>
+                <field name="count"/>
+            </tree>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_mail_mass_mailing_links_search">
+        <field name="name">link.tracker.search</field>
+        <field name="model">link.tracker</field>
+        <field name="inherit_id" ref="link_tracker.view_link_tracker_filter"/>
+        <field name="arch" type="xml">
+           <search string="Tracked Link">
+                <field name="mass_mailing_id"/>
+                <field name="mass_mailing_campaign_id"/>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_view_mass_mailing_links_statistics">
+        <field name="name">Statistics of Clicks</field>
+        <field name="res_model">link.tracker</field>
+        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_mass_mailing_id': active_id}</field>
+    </record>
+       
+    <record model="ir.actions.act_window" id="dropdb snipp">
+        <field name="name">Statistics of Clicks</field>
+        <field name="res_model">link.tracker</field>
+        <field name="view_mode">tree</field>
+        <field name="context">{'search_default_mass_mailing_campaign_id': active_id}</field>
+    </record>
+</odoo>
diff --git a/addons/mass_mailing/views/mass_mailing_report_views.xml b/addons/mass_mailing/views/mass_mailing_report_views.xml
index ca240aba301..609b9ef8734 100644
--- a/addons/mass_mailing/views/mass_mailing_report_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_report_views.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
+<odoo>
         <record id="view_mail_statistics_report_pivot" model="ir.ui.view">
             <field name="name">mail.statistics.report.pivot</field>
             <field name="model">mail.statistics.report</field>
@@ -63,6 +61,4 @@
        <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="60"/>
        <menuitem name="Reports" id="menu_mass_mailing_report" sequence="99"
             parent="mass_mailing_menu_root" action="action_mail_statistics_report" groups="mass_mailing.group_mass_mailing_user"/>
-
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/views/mass_mailing_stats_views.xml b/addons/mass_mailing/views/mass_mailing_stats_views.xml
new file mode 100644
index 00000000000..f6c94bae83c
--- /dev/null
+++ b/addons/mass_mailing/views/mass_mailing_stats_views.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!--  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_int"/>
+                <field name="message_id"/>
+                <field name="mass_mailing_id"/>
+                <filter string="Received" name="filter_received" domain="[('sent', '!=', False), ('bounced', '=', False)]"/>
+                <filter string="Opened" name="filter_opened" domain="[('opened', '!=', False)]"/>
+                <filter string="Replied" name="filter_replied" domain="[('replied', '!=', False)]"/>
+                <filter string="Bounced" name="filter_bounced" domain="[('bounced', '!=', False)]"/>
+                <group expand="0" string="Group By">
+                    <filter string="State" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Open Date" name="group_open_date" context="{'group_by': 'opened:day'}"/>
+                    <filter string="Reply Date" name="group_reply_date" context="{'group_by': 'replied:day'}"/>
+                    <filter string="Last State Update" domain="[]" context="{'group_by':'state_update'}"/>
+                    <filter string="Mass Mailing" domain="[]" context="{'group_by':'mass_mailing_id'}"/>
+                </group>
+            </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>
+        <field name="arch" type="xml">
+            <tree string="Mail Statistics">
+                <field name="recipient"/>
+                <field name="mail_mail_id_int"/>
+                <field name="message_id"/>
+                <field name="sent"/>
+                <field name="exception"/>
+                <field name="opened"/>
+                <field name="replied"/>
+                <field name="bounced"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_mail_mail_statistics_form">
+        <field name="name">mail.mail.statistics.form</field>
+        <field name="model">mail.mail.statistics</field>
+        <field name="arch" type="xml">
+            <form string="Mail Statistics">
+                <group>
+                    <group>
+                        <field name="recipient"/>
+                        <field name="mail_mail_id"/>
+                        <field name="mail_mail_id_int"/>
+                        <field name="message_id"/>
+                        <field name="exception"/>
+                        <field name="sent"/>
+                        <field name="opened"/>
+                        <field name="replied"/>
+                        <field name="bounced"/>
+                    </group>
+                    <group>
+                        <field name="mass_mailing_id"/>
+                        <field name="mass_mailing_campaign_id"/>
+                        <field name="model"/>
+                        <field name="res_id"/>
+                    </group>
+                </group>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_view_mail_mail_statistics" model="ir.actions.act_window">
+        <field name="name">Mail Statistics</field>
+        <field name="res_model">mail.mail.statistics</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="action_view_mail_mail_statistics_mailing" model="ir.actions.act_window">
+        <field name="name">Mail Statistics</field>
+        <field name="res_model">mail.mail.statistics</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">graph,tree,form</field>
+        <field name="domain">[]</field>
+        <field name="context">{'search_default_mass_mailing_id': active_id}</field>
+    </record>
+
+    <record id="view_mail_mail_statistics_graph" model="ir.ui.view">
+        <field name="name">Mail Statistics Graph</field>
+        <field name="model">mail.mail.statistics</field>
+        <field name="arch" type="xml">
+            <graph string="Mail Statistics" type="bar" stacked="True" interval="day">
+                <field name="state_update" type="row" interval="day"/>
+                <field name="state" type="row"/>
+            </graph>
+        </field>
+    </record>
+
+    <!-- Add in Technical/Email -->
+    <menuitem name="Mail Statistics" id="menu_email_statistics"
+        parent="base.menu_email" sequence="50"
+        action="action_view_mail_mail_statistics"/>
+</odoo>
diff --git a/addons/mass_mailing/views/mass_mailing_template.xml b/addons/mass_mailing/views/mass_mailing_template.xml
new file mode 100644
index 00000000000..0645abcd18c
--- /dev/null
+++ b/addons/mass_mailing/views/mass_mailing_template.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_backend" name="mass_mailing assets" inherit_id="web.assets_backend">
+        <xpath expr="." position="inside">
+            <link rel="stylesheet" href="/mass_mailing/static/src/less/mass_mailing.less"/>
+            <link rel="stylesheet" href="/mass_mailing/static/src/css/email_template.css"/>
+            <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing.js"></script>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml
index 198687acaa0..df0ab573074 100644
--- a/addons/mass_mailing/views/mass_mailing_views.xml
+++ b/addons/mass_mailing/views/mass_mailing_views.xml
@@ -1,13 +1,5 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <template id="assets_backend" name="mass_mailing assets" inherit_id="web.assets_backend">
-            <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/mass_mailing/static/src/less/mass_mailing.less"/>
-                <link rel="stylesheet" href="/mass_mailing/static/src/css/email_template.css"/>
-                <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing.js"></script>
-            </xpath>
-        </template>
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
 
         <!-- Marketing / Mass Mailing -->
         <menuitem name="Mass Mailing" id="mass_mailing_menu_root" sequence="60" web_icon="mass_mailing,static/description/icon.png"/>
@@ -17,107 +9,6 @@
         <menuitem name="Configuration" id="mass_mailing_configuration"
             parent="mass_mailing_menu_root" sequence="100"/>
 
-        <!--  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_int"/>
-                    <field name="message_id"/>
-                    <field name="mass_mailing_id"/>
-                    <filter string="Received" name="filter_received" domain="[('sent', '!=', False), ('bounced', '=', False)]"/>
-                    <filter string="Opened" name="filter_opened" domain="[('opened', '!=', False)]"/>
-                    <filter string="Replied" name="filter_replied" domain="[('replied', '!=', False)]"/>
-                    <filter string="Bounced" name="filter_bounced" domain="[('bounced', '!=', False)]"/>
-                    <group expand="0" string="Group By">
-                        <filter string="State" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Open Date" name="group_open_date" context="{'group_by': 'opened:day'}"/>
-                        <filter string="Reply Date" name="group_reply_date" context="{'group_by': 'replied:day'}"/>
-                        <filter string="Last State Update" domain="[]" context="{'group_by':'state_update'}"/>
-                        <filter string="Mass Mailing" domain="[]" context="{'group_by':'mass_mailing_id'}"/>
-                    </group>
-                </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>
-            <field name="arch" type="xml">
-                <tree string="Mail Statistics">
-                    <field name="recipient"/>
-                    <field name="mail_mail_id_int"/>
-                    <field name="message_id"/>
-                    <field name="sent"/>
-                    <field name="exception"/>
-                    <field name="opened"/>
-                    <field name="replied"/>
-                    <field name="bounced"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_mail_mail_statistics_form">
-            <field name="name">mail.mail.statistics.form</field>
-            <field name="model">mail.mail.statistics</field>
-            <field name="arch" type="xml">
-                <form string="Mail Statistics">
-                    <group>
-                        <group>
-                            <field name="recipient"/>
-                            <field name="mail_mail_id"/>
-                            <field name="mail_mail_id_int"/>
-                            <field name="message_id"/>
-                            <field name="exception"/>
-                            <field name="sent"/>
-                            <field name="opened"/>
-                            <field name="replied"/>
-                            <field name="bounced"/>
-                        </group>
-                        <group>
-                            <field name="mass_mailing_id"/>
-                            <field name="mass_mailing_campaign_id"/>
-                            <field name="model"/>
-                            <field name="res_id"/>
-                        </group>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_view_mail_mail_statistics" model="ir.actions.act_window">
-            <field name="name">Mail Statistics</field>
-            <field name="res_model">mail.mail.statistics</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="action_view_mail_mail_statistics_mailing" model="ir.actions.act_window">
-            <field name="name">Mail Statistics</field>
-            <field name="res_model">mail.mail.statistics</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree,form</field>
-            <field name="domain">[]</field>
-            <field name="context">{'search_default_mass_mailing_id': active_id}</field>
-        </record>
-
-        <record id="view_mail_mail_statistics_graph" model="ir.ui.view">
-            <field name="name">Mail Statistics Graph</field>
-            <field name="model">mail.mail.statistics</field>
-            <field name="arch" type="xml">
-                <graph string="Mail Statistics" type="bar" stacked="True" interval="day">
-                    <field name="state_update" type="row" interval="day"/>
-                    <field name="state" type="row"/>
-                </graph>
-            </field>
-        </record>
-
-        <!-- Add in Technical/Email -->
-        <menuitem name="Mail Statistics" id="menu_email_statistics"
-            parent="base.menu_email" sequence="50"
-            action="action_view_mail_mail_statistics"/>
-
         <!--  MASS MAILING CONTACT -->
         
         <!-- Custom reports (aka filters) -->
@@ -169,7 +60,7 @@
                     <field name="message_bounce"/>
                     <field name="create_date"/>
                     <field name="unsubscription_date" readonly="1"/>
-                    <field name="opt_out" on_change="on_change_opt_out(opt_out)"/>
+                    <field name="opt_out"/>
                 </tree>
             </field>
         </record>
@@ -334,39 +225,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_mail_mass_mailing_links_tree">
-            <field name="name">link.tracker.tree</field>
-            <field name="model">link.tracker</field>
-            <field name="priority">10</field>
-            <field name="arch" type="xml">
-                <tree string="Mailing Statistics of Clicks" create='false'>
-                    <field name="title"/>
-                    <field name="url"/>
-                    <field name="count"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_mail_mass_mailing_links_search">
-            <field name="name">link.tracker.search</field>
-            <field name="model">link.tracker</field>
-            <field name="inherit_id" ref="link_tracker.view_link_tracker_filter"/>
-            <field name="arch" type="xml">
-               <search string="Tracked Link">
-                    <field name="mass_mailing_id"/>
-                    <field name="mass_mailing_campaign_id"/>
-                </search>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_view_mass_mailing_links_statistics">
-            <field name="name">Statistics of Clicks</field>
-            <field name="res_model">link.tracker</field>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_mail_mass_mailing_links_tree"/>
-            <field name="context">{'search_default_mass_mailing_id': active_id}</field>
-        </record>
-
         <record model="ir.ui.view" id="view_mail_mass_mailing_form">
             <field name="name">mail.mass_mailing.form</field>
             <field name="model">mail.mass_mailing</field>
@@ -445,8 +303,7 @@
                             </div>
                             <label for="mailing_model" string="Recipients"/>
                             <div>
-                                <field name="mailing_model" widget="radio" style="margin-bottom: 8px"
-                                    on_change="on_change_model_and_list(mailing_model, contact_list_ids)"/>
+                                <field name="mailing_model" widget="radio" style="margin-bottom: 8px"/>
 
                                 <field name="mailing_domain" widget="char_domain"
                                     placeholder="Select recipients"
@@ -457,8 +314,7 @@
                                 <div attrs="{'invisible': [('mailing_model', '&lt;&gt;', 'mail.mass_mailing.contact')]}">
                                     <label for="contact_list_ids" string="Select mailing lists:" class="oe_edit_only"/>
                                     <field name="contact_list_ids" widget="many2many_tags"
-                                        placeholder="Select mailing lists..." class="oe_inline"
-                                        on_change="on_change_model_and_list(mailing_model, contact_list_ids)"/>
+                                        placeholder="Select mailing lists..." class="oe_inline"/>
                                 </div>
                             </div>
                             <label for="attachment_ids"/>
@@ -486,7 +342,7 @@
                                         <field name="sent_date" readonly="1" attrs="{'invisible': [('sent_date', '=', False)]}"/>
                                     </group>
                                     <group string="Campaign" groups="mass_mailing.group_mass_mailing_campaign">
-                                        <field name="mass_mailing_campaign_id" string="Campaign" on_change="onchange_mass_mailing_campaign_id(mass_mailing_campaign_id)"/>
+                                        <field name="mass_mailing_campaign_id" string="Campaign"/>
                                         <label for="contact_ab_pc"/>
                                         <div>
                                             <field name="contact_ab_pc" class="oe_inline"/> %
@@ -749,13 +605,6 @@
             </field>
         </record>
 
-        <record model="ir.actions.act_window" id="dropdb snipp">
-            <field name="name">Statistics of Clicks</field>
-            <field name="res_model">link.tracker</field>
-            <field name="view_mode">tree</field>
-            <field name="context">{'search_default_mass_mailing_campaign_id': active_id}</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>
@@ -921,5 +770,4 @@
             action="action_view_mass_mailing_campaigns"
             groups="mass_mailing.group_mass_mailing_campaign"/>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/views/res_config_views.xml b/addons/mass_mailing/views/res_config_views.xml
index a687cc64c53..7b1744a1465 100644
--- a/addons/mass_mailing/views/res_config_views.xml
+++ b/addons/mass_mailing/views/res_config_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
         <record id="view_mass_mailing_configuration" model="ir.ui.view">
             <field name="name">Configure Mass Mailing</field>
             <field name="model">mass.mailing.config.settings</field>
@@ -35,5 +34,4 @@
             sequence="100"/>
         <menuitem id="menu_mass_mailing_global_settings" name="Settings" 
             parent="menu_mass_mailing_configuration" sequence="0" action="action_mass_mailing_configuration" groups="base.group_system"/>
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/wizard/mail_compose_message_views.xml b/addons/mass_mailing/wizard/mail_compose_message_views.xml
index 61cfe823006..e6abc5e1fe1 100644
--- a/addons/mass_mailing/wizard/mail_compose_message_views.xml
+++ b/addons/mass_mailing/wizard/mail_compose_message_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
+<odoo>
 
         <!-- Add mass mail campaign to the mail.compose.message form view -->
         <record model="ir.ui.view" id="email_compose_form_mass_mailing">
@@ -17,5 +16,4 @@
             </field>
         </record>
 
-    </data>
-</openerp>
+</odoo>
diff --git a/addons/mass_mailing/wizard/test_mailing_views.xml b/addons/mass_mailing/wizard/test_mailing_views.xml
index 1cfee09a977..8b69bc0a4b1 100644
--- a/addons/mass_mailing/wizard/test_mailing_views.xml
+++ b/addons/mass_mailing/wizard/test_mailing_views.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<openerp>
-    <data>
+<odoo>
 
         <record model="ir.ui.view" id="view_mail_mass_mailing_test_form">
             <field name="name">mail.mass_mailing.test.form</field>
@@ -29,5 +28,4 @@
             <field name="target">new</field>
         </record>
 
-    </data>
-</openerp>
+</odoo>