diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 63b27d9dfd2..f3df196ea13 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -8,14 +8,48 @@
             <field name="name">SampleDoc.doc</field>
         </record>
 
-        <record id="mass_mail_template_1" model="email.template">
-            <field name="name">Partner Newsletter</field>
-            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="auto_delete" eval="False"/>
-            <field name="partner_to">${object.id}</field>
+        <!-- Create mailing lists -->
+        <record id="mass_mail_list_1" model="mail.mass_mailing.list">
+            <field name="name">Imported Contacts</field>
+        </record>
+
+        <!-- Create Contacts -->
+        <record id="mass_mail_contact_1" model="mail.mass_mailing.contact">
+            <field name="name">Aristide Antario</field>
+            <field name="email">aa@example.com</field>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
+        </record>
+        <record id="mass_mail_contact_2" model="mail.mass_mailing.contact">
+            <field name="name">Beverly Bridge</field>
+            <field name="email">bb@example.com</field>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
+        </record>
+        <record id="mass_mail_contact_3" model="mail.mass_mailing.contact">
+            <field name="name">Carol Cartridge</field>
+            <field name="email">cc@example.com</field>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
+            <field name="opt_out" eval="True"/>
+        </record>
+
+        <!-- Create campaign and mailings -->
+        <record id="mass_mail_category_1" model="mail.mass_mailing.category">
+            <field name="name">Marketing</field>
+        </record>
+        <record id="mass_mail_campaign_1" model="mail.mass_mailing.campaign">
+            <field name="name">Newsletter</field>
+            <field name="stage_id" ref="mass_mailing.campaign_stage_1"/>
+            <field name="user_id" eval="ref('base.user_root')"/>
+            <field name="category_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_category_1')])]"/>
+        </record>
+
+        <record id="mass_mail_1" model="mail.mass_mailing">
+            <field name="name">First Newsletter</field>
+            <field name="state">done</field>
+            <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
+            <field name="mailing_model">res.partner</field>
+            <field name="mailing_domain">[('customer', '=', True)]</field>
             <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field>
-            <field name="use_default_to" eval="True"/>
-            <field name="attachment_ids" eval="[(4, ref('mass_mail_attach_1'))]"/>
             <field name="body_html"><![CDATA[<div data-snippet-id="big-picture" style="padding:0px; margin:0px">
 <table cellpadding="0" cellspacing="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
     <tbody>
@@ -63,58 +97,15 @@
     </tbody>
 </table>
 </div>]]></field>
-        </record>
-
-        <!-- Create mailing lists -->
-        <record id="mass_mail_list_1" model="mail.mass_mailing.list">
-            <field name="name">Imported Contacts</field>
-        </record>
-        <record id="mass_mail_list_2" model="mail.mass_mailing.list">
-            <field name="name">Customers</field>
-        </record>
-
-        <!-- Create Contacts -->
-        <record id="mass_mail_contact_1" model="mail.mass_mailing.contact">
-            <field name="name">Aristide Antario</field>
-            <field name="email">aa@example.com</field>
-            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
-        </record>
-        <record id="mass_mail_contact_2" model="mail.mass_mailing.contact">
-            <field name="name">Beverly Bridge</field>
-            <field name="email">bb@example.com</field>
-            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
-        </record>
-        <record id="mass_mail_contact_3" model="mail.mass_mailing.contact">
-            <field name="name">Carol Cartridge</field>
-            <field name="email">cc@example.com</field>
-            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
-            <field name="opt_out" eval="True"/>
-        </record>
-
-        <!-- Create campaign and mailings -->
-        <record id="mass_mail_category_1" model="mail.mass_mailing.category">
-            <field name="name">Marketing</field>
-        </record>
-        <record id="mass_mail_campaign_1" model="mail.mass_mailing.campaign">
-            <field name="name">Newsletter</field>
-            <field name="stage_id" ref="mass_mailing.campaign_stage_1"/>
-            <field name="user_id" eval="ref('base.user_root')"/>
-            <field name="category_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_category_1')])]"/>
-        </record>
-
-        <record id="mass_mail_1" model="mail.mass_mailing">
-            <field name="name">First Newsletter</field>
-            <field name="state">done</field>
-            <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
-            <field name="contact_list_ids" eval="[(4, ref('mass_mail_list_2'))]"/>
-            <field name="reply_to">info@yourcompany.example.com</field>
+            <field name="attachment_ids" eval="[(4, ref('mass_mail_attach_1'))]"/>
         </record>
         <record id="mass_mail_2" model="mail.mass_mailing">
             <field name="name">Second Newsletter</field>
             <field name="state">test</field>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
-            <field name="reply_to">info@yourcompany.example.com</field>
+            <field name="mailing_model">res.partner</field>
+            <field name="mailing_domain">[('customer', '=', True)]</field>
+            <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field>
         </record>
 
         <record id="mass_mail_email_1" model="mail.mail.statistics">