diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index 55f7e5452b8..69465997bcc 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Email Marketing',
     'summary': 'Design, send and track emails',
-    'version': '2.6',
+    'version': '2.7',
     'sequence': 60,
     'website': 'https://www.odoo.com/app/email-marketing',
     'category': 'Marketing/Email Marketing',
@@ -27,7 +27,8 @@
         'data/ir_cron_data.xml',
         'data/ir_module_data.xml',
         'data/mailing_data_templates.xml',
-        'data/mailing_list_data.xml',
+        'data/mailing_list_contact.xml',
+        'data/mailing_contact_subscription.xml',
         'data/res_users_data.xml',
         'wizard/mail_compose_message_views.xml',
         'wizard/mailing_contact_import_views.xml',
@@ -79,7 +80,11 @@
         'views/snippets/s_title.xml',
     ],
     'demo': [
-        'data/mass_mailing_demo.xml',
+        'demo/utm.xml',
+        'demo/mailing_list_contact.xml',
+        'demo/mailing_contact_subscription.xml',
+        'demo/mailing_mailing.xml',
+        'demo/mailing_trace.xml',
     ],
     'application': True,
     'assets': {
diff --git a/addons/mass_mailing/data/mailing_contact_subscription.xml b/addons/mass_mailing/data/mailing_contact_subscription.xml
new file mode 100644
index 00000000000..8c6302d421b
--- /dev/null
+++ b/addons/mass_mailing/data/mailing_contact_subscription.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mailing_list_data_sub_contact_0" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_0"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/mass_mailing/data/mailing_list_data.xml b/addons/mass_mailing/data/mailing_list_contact.xml
similarity index 72%
rename from addons/mass_mailing/data/mailing_list_data.xml
rename to addons/mass_mailing/data/mailing_list_contact.xml
index 645ac7e3ced..6cadf031483 100644
--- a/addons/mass_mailing/data/mailing_list_data.xml
+++ b/addons/mass_mailing/data/mailing_list_contact.xml
@@ -4,10 +4,10 @@
         <record id="mailing_list_data" model="mailing.list">
             <field name="name">Newsletter</field>
         </record>
-        <record id="mass_mailing_contact_0" model="mailing.contact">
+        <record id="mass_mail_contact_0" model="mailing.contact">
             <field name="name" model="res.users" eval="obj().env.ref('base.user_admin').name"/>
             <field name="email" model="res.users" eval="obj().env.ref('base.user_admin').email"/>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mailing_list_data')])]"/>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
deleted file mode 100644
index b9fadfee298..00000000000
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-        <record id="mass_mail_attach_1" model="ir.attachment">
-            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
-            <field name="name">SampleDoc.doc</field>
-        </record>
-
-        <!-- Create Extra Mailing List for Demo -->
-        <record id="mailing_list_1" model="mailing.list">
-            <field name="name">Imported Contacts</field>
-        </record>
-
-        <!-- Create Contacts -->
-        <record id="mass_mail_contact_1" model="mailing.contact">
-            <field name="name">Aristide Antario</field>
-            <field name="email">alexandre.antario@example.com</field>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mailing_list_data')])]"/>
-        </record>
-        <record id="mass_mail_contact_2" model="mailing.contact">
-            <field name="name">Beverly Bridge</field>
-            <field name="email">beverly.bridge@example.com</field>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mailing_list_data')])]"/>
-        </record>
-        <record id="mass_mail_contact_3" model="mailing.contact">
-            <field name="name">Carol Cartridge</field>
-            <field name="email">carol.cartridge@example.com</field>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mailing_list_data'),ref('mass_mailing.mailing_list_1')])]"/>
-        </record>
-        <record id="mass_mail_contact_4" model="mailing.contact">
-            <field name="name">David Dawson</field>
-            <field name="email">david.dawson@example.com</field>
-        </record>
-        <record id="mass_mail_contact_5" model="mailing.contact">
-            <field name="name">Elsa Ericson</field>
-            <field name="email">elsa.ericson@example.com</field>
-            <field name="message_bounce">5</field>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mailing_list_data')])]"/>
-        </record>
-        <record id="mass_mail_contact_6" model="mailing.contact">
-            <field name="name">Franz Faubourg</field>
-            <field name="email">franz.faubourg@example.com</field>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mailing_list_1')])]"/>
-        </record>
-
-        <!-- Create Opt-out Records -->
-        <record id="mass_mail_contact_list_rel_1" model="mailing.contact.subscription">
-            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
-            <field name="contact_id" ref="mass_mailing.mass_mail_contact_4"/>
-            <field name="opt_out">True</field>
-        </record>
-        <record id="mass_mail_contact_list_rel_2" model="mailing.contact.subscription">
-            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
-            <field name="contact_id" ref="mass_mailing.mass_mail_contact_6"/>
-            <field name="opt_out">True</field>
-        </record>
-
-        <!-- Create Blacklist Records -->
-        <record id="blacklist_1" model="mail.blacklist">
-            <field name="email">elsa.ericson@example.com</field>
-        </record>
-
-        <!-- Create campaign and mailings -->
-        <record id="utm_source_0" model="utm.source">
-            <field name="name">Newsletter 1</field>
-        </record>
-        <record id="mass_mail_campaign_1" model="utm.campaign">
-            <field name="name">Newsletter</field>
-            <field name="stage_id" ref="utm.campaign_stage_1"/>
-            <field name="user_id" ref="base.user_admin"/>
-            <field name="tag_ids" eval="[(6,0,[ref('utm.utm_tag_1')])]"/>
-        </record>
-
-        <record id="mass_mail_1" model="mailing.mailing">
-            <field name="name">Newsletter 1</field>
-            <field name="subject">Monthly Newsletter</field>
-            <field name="state">done</field>
-            <field name="user_id" ref="base.user_admin"/>
-            <field name="email_from">info@yourcompany.example.com</field>
-            <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="campaign_id" ref="mass_mail_campaign_1"/>
-            <field name="source_id" ref="mass_mailing.utm_source_0"/>
-            <field name="mailing_model_id" ref="base.model_res_partner"/>
-            <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
-            <field name="reply_to_mode">new</field>
-            <field name="reply_to">Info &lt;info@yourcompany.example.com&gt;</field>
-            <field name="body_arch" type="html">
-<div class="o_layout o_default_theme oe_unremovable oe_unmovable" data-name="Mailing">
-    <div class="container o_mail_wrapper oe_unremovable oe_unmovable" style="border-collapse:collapse;">
-        <div class="row">
-            <div class="col o_mail_no_options o_mail_wrapper_td bg-white oe_structure o_editable" style="text-align:left;width:100%;">
-                <div class="o_mail_block_header_logo" data-snippet="s_mail_block_header_logo">
-                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div class="container o_mail_h_padding" style="padding:0 20px 0 20px;width:100%;border-collapse:separate;">
-                            <div class="row">
-                                <div valign="center" width="30%" class="col text-center o_mail_v_padding pb0" style="padding:20px 0 0px 0;vertical-align:middle;text-align:center;">
-                                    <a href="http://www.example.com" style="text-decoration:none;font-weight:bold;background-color:transparent;color:rgb(100, 89, 116);">
-                                        <img border="0" src="/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png" style="border-style:none;height:auto;vertical-align:middle;max-width:400px;width:auto"/> ​
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="o_mail_block_footer_separator" data-snippet="s_hr" style="margin:0 20px 0 20px;">
-                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div class="container" style="width:100%;border-collapse:separate;">
-                            <div class="row">
-                                <div valign="top" style="padding:20px 0 20px 0;text-align:left;vertical-align:top;width:100%;" class="col o_mail_v_padding o_mail_no_colorpicker">
-                                    <div style="background-color:rgb(245, 245, 245);height:2px;width:100%;" class="separator"></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="o_mail_block_text" data-snippet="s_text_block">
-                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div class="container" style="width:100%;border-collapse:separate;">
-                            <div class="row">
-                                <div class="col-12 o_mail_h_padding o_mail_v_padding o_mail_no_colorpicker" style="padding:20px;text-align:left;vertical-align:top;">
-                                    <p style="margin:0px 0 1rem 0;font-size:14px;">
-                                        Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
-                                        <br/>Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="o_mail_block_footer_social o_mail_footer_social_center" data-snippet="s_mail_block_footer_social">
-                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
-                        <div align="center" class="container" style="border-style:solid none none none;padding:20px 0 20px 0;border-top-color:rgb(245, 245, 245);border-top-width:2px;width:100%;border-collapse:separate;">
-                            <div class="row">
-                                <div class="col o_mail_footer_links o_default_snippet_text" style="padding:10px 0 10px 0;text-align:center;vertical-align:middle;">
-                                    <a href="/unsubscribe_from_list" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-start-color:transparent;border-bottom-color:transparent;border-end-color:transparent;border-top-color:transparent;border-start-width:1px;border-bottom-width:1px;border-end-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Unsubscribe</a> |
-
-                                    <a href="/contactus" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-start-color:transparent;border-bottom-color:transparent;border-end-color:transparent;border-top-color:transparent;border-start-width:1px;border-bottom-width:1px;border-end-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Contact</a>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col" style="text-align:left;vertical-align:middle;">
-                                    <p class="o_mail_footer_copy" style="margin:0px 0 1rem 0;text-align:center;font-weight:bold;color:rgb(147, 146, 146);font-size:9px;">
-                                        <img src="/web_editor/font_to_img/61945/rgb(147,146,146)/9" data-class="fa fa-copyright" style="border-style:none;max-width:100%;width:100%;vertical-align:middle;height: auto; width: auto;"/>2018 All Rights Reserved
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div align="center" class="container" style="width:100%;border-collapse:separate;">
-        <div class="row">
-            <div align="center" style="padding:16px 0 16px 0;" class="col pt16 pb16">
-                Powered by <a target="_blank" href="https://www.odoo.com" style="text-decoration:none;background-color:transparent;color:#875A7B;">Odoo</a>
-            </div>
-        </div>
-    </div>
-</div>
-</field>
-            <field name="attachment_ids" eval="[(4, ref('mass_mail_attach_1'))]"/>
-        </record>
-        <!-- Generate link tracker information from it -->
-        <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing.mass_mail_1')]"/>
-
-        <record id="mass_mail_1_stat_0" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111000@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_7"/>
-            <field name="email">billy.fox45@example.com</field>
-            <field name="trace_status">reply</field>
-            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=4)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="reply_datetime" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="write_date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        </record>
-        <record id="mass_mail_1_stat_1" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111001@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_13"/>
-            <field name="email">kim.snyder96@example.com</field>
-            <field name="trace_status">reply</field>
-            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="reply_datetime" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="write_date" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        </record>
-        <record id="mass_mail_1_stat_2" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111002@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_14"/>
-            <field name="email">edith.sanchez68@example.com</field>
-            <field name="trace_status">open</field>
-            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="write_date" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        </record>
-        <record id="mass_mail_1_stat_3" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111003@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_24"/>
-            <field name="email">theodore.gardner36@example.com</field>
-            <field name="trace_status">open</field>
-            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="write_date" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        </record>
-        <record id="mass_mail_1_stat_4" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111004@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_32"/>
-            <field name="email">sandra.neal80@example.com</field>
-            <field name="trace_status">sent</field>
-            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="write_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        </record>
-        <record id="mass_mail_1_stat_5" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111005@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_33"/>
-            <field name="email">julie.richards84@example.com</field>
-            <field name="trace_status">error</field>
-            <field name="sent_datetime" eval="False"/>
-        </record>
-        <record id="mass_mail_1_stat_6" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111006@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_34"/>
-            <field name="email">travis.mendoza24@example.com</field>
-            <field name="trace_status">bounce</field>
-            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-            <field name="write_date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        </record>
-        <record id="mass_mail_1_stat_7" model="mailing.trace">
-            <field name="mass_mailing_id" ref="mass_mail_1"/>
-            <field name="message_id">1111007@odoo.com</field>
-            <field name="model">res.partner</field>
-            <field name="res_id" ref="base.res_partner_address_34"/>
-            <field name="email">travis.mendoza24@example.com</field>
-            <field name="trace_status">bounce</field>
-            <field name="sent_datetime" eval="False"/>
-        </record>
-
-        <!-- Generate some clicks -->
-        <function model="link.tracker.click" name="add_click">
-            <value model="link.tracker.code"
-                search="[('link_id.url', '=', 'http://www.example.com')]"
-                use="code"/>
-            <value name="ip">100.01.02.03</value>
-            <value name="country_code">BE</value>
-            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_0')"/>
-        </function>
-        <function model="link.tracker.click" name="add_click">
-            <value model="link.tracker.code"
-                search="[('link_id.url', '=', 'http://www.example.net/page/contactus')]"
-                use="code"/>
-            <value name="ip">100.01.02.03</value>
-            <value name="country_code">BE</value>
-            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_0')"/>
-        </function>
-        <function model="link.tracker.click" name="add_click">
-            <value model="link.tracker.code"
-                search="[('link_id.url', '=', 'http://www.example.com')]"
-                use="code"/>
-            <value name="ip">100.01.02.04</value>
-            <value name="country_code">BE</value>
-            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_1')"/>
-        </function>
-        <function model="link.tracker.click" name="add_click">
-            <value model="link.tracker.code"
-                search="[('link_id.url', '=', 'http://www.example.net/page/contactus')]"
-                use="code"/>
-            <value name="ip">100.01.02.04</value>
-            <value name="country_code">BE</value>
-            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_0')"/>
-        </function>
-        <function model="link.tracker.click" name="add_click">
-            <value model="link.tracker.code"
-                search="[('link_id.url', '=', 'http://www.example.com')]"
-                use="code"/>
-            <value name="ip">100.01.02.05</value>
-            <value name="country_code">BE</value>
-            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_2')"/>
-        </function>
-
-    </data>
-</odoo>
diff --git a/addons/mass_mailing/demo/mailing_contact_subscription.xml b/addons/mass_mailing/demo/mailing_contact_subscription.xml
new file mode 100644
index 00000000000..d15cf6b1bd4
--- /dev/null
+++ b/addons/mass_mailing/demo/mailing_contact_subscription.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- Subscription to 'mailing_list_data' -->
+       <record id="mailing_list_data_sub_contact_1" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_1"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+        </record>
+        <record id="mailing_list_data_sub_contact_2" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_2"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+        </record>
+        <record id="mailing_list_data_sub_contact_3" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_3"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+        </record>
+        <record id="mailing_list_data_sub_contact_4" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_4"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+            <field name="opt_out">True</field>
+        </record>
+        <record id="mailing_list_data_sub_contact_5" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_5"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+        </record>
+        <record id="mailing_list_data_sub_contact_6" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_6"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_data"/>
+            <field name="opt_out">True</field>
+        </record>
+        <!-- Subscription to 'mailing_list_1' -->
+        <record id="mailing_list_1_sub_contact_3" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_3"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_1"/>
+        </record>
+        <record id="mailing_list_1_sub_contact_6" model="mailing.contact.subscription">
+            <field name="contact_id" ref="mass_mailing.mass_mail_contact_6"/>
+            <field name="list_id" ref="mass_mailing.mailing_list_1"/>
+        </record>
+
+        <!-- Create Blacklist Records -->
+        <record id="mail_blacklist_demo_1" model="mail.blacklist">
+            <field name="email">elsa.ericson@example.com</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/mass_mailing/demo/mailing_list_contact.xml b/addons/mass_mailing/demo/mailing_list_contact.xml
new file mode 100644
index 00000000000..8e788cf2f63
--- /dev/null
+++ b/addons/mass_mailing/demo/mailing_list_contact.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- Create Extra Mailing List for Demo -->
+        <record id="mailing_list_1" model="mailing.list">
+            <field name="name">Imported Contacts</field>
+        </record>
+
+        <!-- Create Contacts -->
+        <record id="mass_mail_contact_1" model="mailing.contact">
+            <field name="name">Aristide Antario</field>
+            <field name="email">alexandre.antario@example.com</field>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
+        </record>
+        <record id="mass_mail_contact_2" model="mailing.contact">
+            <field name="name">Beverly Bridge</field>
+            <field name="email">beverly.bridge@example.com</field>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
+        </record>
+        <record id="mass_mail_contact_3" model="mailing.contact">
+            <field name="name">Carol Cartridge</field>
+            <field name="email">carol.cartridge@example.com</field>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
+        </record>
+        <record id="mass_mail_contact_4" model="mailing.contact">
+            <field name="name">David Dawson</field>
+            <field name="email">david.dawson@example.com</field>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
+        </record>
+        <record id="mass_mail_contact_5" model="mailing.contact">
+            <field name="name">Elsa Ericson</field>
+            <field name="email">elsa.ericson@example.com</field>
+            <field name="message_bounce">5</field>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
+        </record>
+        <record id="mass_mail_contact_6" model="mailing.contact">
+            <field name="name">Franz Faubourg</field>
+            <field name="email">franz.faubourg@example.com</field>
+            <field name="list_ids" eval="[(5, 0, 0)]"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/mass_mailing/demo/mailing_mailing.xml b/addons/mass_mailing/demo/mailing_mailing.xml
new file mode 100644
index 00000000000..5bfad119f40
--- /dev/null
+++ b/addons/mass_mailing/demo/mailing_mailing.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mass_mail_attach_1" model="ir.attachment">
+            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
+            <field name="name">SampleDoc.doc</field>
+        </record>
+
+        <record id="mass_mail_1" model="mailing.mailing">
+            <field name="name">Newsletter 1</field>
+            <field name="subject">Monthly Newsletter</field>
+            <field name="state">done</field>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="email_from">info@yourcompany.example.com</field>
+            <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="campaign_id" ref="mass_mail_campaign_1"/>
+            <field name="source_id" ref="mass_mailing.utm_source_0"/>
+            <field name="mailing_model_id" ref="base.model_res_partner"/>
+            <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
+            <field name="reply_to_mode">new</field>
+            <field name="reply_to">Info &lt;info@yourcompany.example.com&gt;</field>
+            <field name="body_arch" type="html">
+<div class="o_layout o_default_theme oe_unremovable oe_unmovable" data-name="Mailing">
+    <div class="container o_mail_wrapper oe_unremovable oe_unmovable" style="border-collapse:collapse;">
+        <div class="row">
+            <div class="col o_mail_no_options o_mail_wrapper_td bg-white oe_structure o_editable" style="text-align:left;width:100%;">
+                <div class="o_mail_block_header_logo" data-snippet="s_mail_block_header_logo">
+                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
+                        <div class="container o_mail_h_padding" style="padding:0 20px 0 20px;width:100%;border-collapse:separate;">
+                            <div class="row">
+                                <div valign="center" width="30%" class="col text-center o_mail_v_padding pb0" style="padding:20px 0 0px 0;vertical-align:middle;text-align:center;">
+                                    <a href="http://www.example.com" style="text-decoration:none;font-weight:bold;background-color:transparent;color:rgb(100, 89, 116);">
+                                        <img border="0" src="/mass_mailing/static/src/img/theme_default/s_default_image_header_logo.png" style="border-style:none;height:auto;vertical-align:middle;max-width:400px;width:auto"/> ​
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="o_mail_block_footer_separator" data-snippet="s_hr" style="margin:0 20px 0 20px;">
+                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
+                        <div class="container" style="width:100%;border-collapse:separate;">
+                            <div class="row">
+                                <div valign="top" style="padding:20px 0 20px 0;text-align:left;vertical-align:top;width:100%;" class="col o_mail_v_padding o_mail_no_colorpicker">
+                                    <div style="background-color:rgb(245, 245, 245);height:2px;width:100%;" class="separator"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="o_mail_block_text" data-snippet="s_text_block">
+                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
+                        <div class="container" style="width:100%;border-collapse:separate;">
+                            <div class="row">
+                                <div class="col-12 o_mail_h_padding o_mail_v_padding o_mail_no_colorpicker" style="padding:20px;text-align:left;vertical-align:top;">
+                                    <p style="margin:0px 0 1rem 0;font-size:14px;">
+                                        Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.
+                                        <br/>Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="o_mail_block_footer_social o_mail_footer_social_center" data-snippet="s_mail_block_footer_social">
+                    <div class="o_mail_snippet_general" style="margin:0px auto 0px auto;background-color:rgb(255, 255, 255);max-width:600px;width:100%;">
+                        <div align="center" class="container" style="border-style:solid none none none;padding:20px 0 20px 0;border-top-color:rgb(245, 245, 245);border-top-width:2px;width:100%;border-collapse:separate;">
+                            <div class="row">
+                                <div class="col o_mail_footer_links o_default_snippet_text" style="padding:10px 0 10px 0;text-align:center;vertical-align:middle;">
+                                    <a href="/unsubscribe_from_list" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-start-color:transparent;border-bottom-color:transparent;border-end-color:transparent;border-top-color:transparent;border-start-width:1px;border-bottom-width:1px;border-end-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Unsubscribe</a> |
+
+                                    <a href="/contactus" class="btn btn-link o_default_snippet_text" style="text-decoration:none;border-radius:0.25rem;border-style:solid;padding:0px;cursor:pointer;line-height:1.5;font-size:12px;border-start-color:transparent;border-bottom-color:transparent;border-end-color:transparent;border-top-color:transparent;border-start-width:1px;border-bottom-width:1px;border-end-width:1px;border-top-width:1px;user-select:none;vertical-align:middle;white-space:nowrap;text-align:center;font-weight:bold;display:inline-block;background-color:transparent;color:rgb(100, 89, 116);">Contact</a>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col" style="text-align:left;vertical-align:middle;">
+                                    <p class="o_mail_footer_copy" style="margin:0px 0 1rem 0;text-align:center;font-weight:bold;color:rgb(147, 146, 146);font-size:9px;">
+                                        <img src="/web_editor/font_to_img/61945/rgb(147,146,146)/9" data-class="fa fa-copyright" style="border-style:none;max-width:100%;width:100%;vertical-align:middle;height: auto; width: auto;"/>2018 All Rights Reserved
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div align="center" class="container" style="width:100%;border-collapse:separate;">
+        <div class="row">
+            <div align="center" style="padding:16px 0 16px 0;" class="col pt16 pb16">
+                Powered by <a target="_blank" href="https://www.odoo.com" style="text-decoration:none;background-color:transparent;color:#875A7B;">Odoo</a>
+            </div>
+        </div>
+    </div>
+</div>
+</field>
+            <field name="attachment_ids" eval="[(4, ref('mass_mail_attach_1'))]"/>
+        </record>
+        <!-- Generate link tracker information from it -->
+        <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing.mass_mail_1')]"/>
+    </data>
+</odoo>
diff --git a/addons/mass_mailing/demo/mailing_trace.xml b/addons/mass_mailing/demo/mailing_trace.xml
new file mode 100644
index 00000000000..141973388cd
--- /dev/null
+++ b/addons/mass_mailing/demo/mailing_trace.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="mass_mail_1_stat_0" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111000@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_7"/>
+            <field name="email">billy.fox45@example.com</field>
+            <field name="trace_status">reply</field>
+            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=4)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="reply_datetime" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="write_date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="mass_mail_1_stat_1" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111001@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_13"/>
+            <field name="email">kim.snyder96@example.com</field>
+            <field name="trace_status">reply</field>
+            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="reply_datetime" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="write_date" eval="(DateTime.today() - relativedelta(days=0)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="mass_mail_1_stat_2" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111002@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_14"/>
+            <field name="email">edith.sanchez68@example.com</field>
+            <field name="trace_status">open</field>
+            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="write_date" eval="(DateTime.today() - relativedelta(days=2)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="mass_mail_1_stat_3" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111003@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_24"/>
+            <field name="email">theodore.gardner36@example.com</field>
+            <field name="trace_status">open</field>
+            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="open_datetime" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="write_date" eval="(DateTime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="mass_mail_1_stat_4" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111004@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_32"/>
+            <field name="email">sandra.neal80@example.com</field>
+            <field name="trace_status">sent</field>
+            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="write_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="mass_mail_1_stat_5" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111005@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_33"/>
+            <field name="email">julie.richards84@example.com</field>
+            <field name="trace_status">error</field>
+            <field name="sent_datetime" eval="False"/>
+        </record>
+        <record id="mass_mail_1_stat_6" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111006@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_34"/>
+            <field name="email">travis.mendoza24@example.com</field>
+            <field name="trace_status">bounce</field>
+            <field name="sent_datetime" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+            <field name="write_date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        </record>
+        <record id="mass_mail_1_stat_7" model="mailing.trace">
+            <field name="mass_mailing_id" ref="mass_mail_1"/>
+            <field name="message_id">1111007@odoo.com</field>
+            <field name="model">res.partner</field>
+            <field name="res_id" ref="base.res_partner_address_34"/>
+            <field name="email">travis.mendoza24@example.com</field>
+            <field name="trace_status">bounce</field>
+            <field name="sent_datetime" eval="False"/>
+        </record>
+
+        <!-- Generate some clicks -->
+        <function model="link.tracker.click" name="add_click">
+            <value model="link.tracker.code"
+                search="[('link_id.url', '=', 'http://www.example.com')]"
+                use="code"/>
+            <value name="ip">100.01.02.03</value>
+            <value name="country_code">BE</value>
+            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_0')"/>
+        </function>
+        <function model="link.tracker.click" name="add_click">
+            <value model="link.tracker.code"
+                search="[('link_id.url', '=', 'http://www.example.net/page/contactus')]"
+                use="code"/>
+            <value name="ip">100.01.02.03</value>
+            <value name="country_code">BE</value>
+            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_0')"/>
+        </function>
+        <function model="link.tracker.click" name="add_click">
+            <value model="link.tracker.code"
+                search="[('link_id.url', '=', 'http://www.example.com')]"
+                use="code"/>
+            <value name="ip">100.01.02.04</value>
+            <value name="country_code">BE</value>
+            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_1')"/>
+        </function>
+        <function model="link.tracker.click" name="add_click">
+            <value model="link.tracker.code"
+                search="[('link_id.url', '=', 'http://www.example.net/page/contactus')]"
+                use="code"/>
+            <value name="ip">100.01.02.04</value>
+            <value name="country_code">BE</value>
+            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_0')"/>
+        </function>
+        <function model="link.tracker.click" name="add_click">
+            <value model="link.tracker.code"
+                search="[('link_id.url', '=', 'http://www.example.com')]"
+                use="code"/>
+            <value name="ip">100.01.02.05</value>
+            <value name="country_code">BE</value>
+            <value name="mailing_trace_id" eval="ref('mass_mail_1_stat_2')"/>
+        </function>
+
+    </data>
+</odoo>
diff --git a/addons/mass_mailing/demo/utm.xml b/addons/mass_mailing/demo/utm.xml
new file mode 100644
index 00000000000..acdd572998b
--- /dev/null
+++ b/addons/mass_mailing/demo/utm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- Create campaign and mailings -->
+        <record id="utm_source_0" model="utm.source">
+            <field name="name">Newsletter 1</field>
+        </record>
+        <record id="mass_mail_campaign_1" model="utm.campaign">
+            <field name="name">Newsletter</field>
+            <field name="stage_id" ref="utm.campaign_stage_1"/>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="tag_ids" eval="[(6,0,[ref('utm.utm_tag_1')])]"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/mass_mailing_crm/__manifest__.py b/addons/mass_mailing_crm/__manifest__.py
index 2ee1e7119ec..a812b287953 100644
--- a/addons/mass_mailing_crm/__manifest__.py
+++ b/addons/mass_mailing_crm/__manifest__.py
@@ -12,7 +12,7 @@
         'views/mailing_mailing_views.xml',
     ],
     'demo': [
-        'data/mass_mailing_demo.xml',
+        'demo/mailing_mailing.xml',
     ],
     'auto_install': True,
     'license': 'LGPL-3',
diff --git a/addons/mass_mailing_crm/data/mass_mailing_demo.xml b/addons/mass_mailing_crm/demo/mailing_mailing.xml
similarity index 100%
rename from addons/mass_mailing_crm/data/mass_mailing_demo.xml
rename to addons/mass_mailing_crm/demo/mailing_mailing.xml
diff --git a/addons/mass_mailing_sale/__manifest__.py b/addons/mass_mailing_sale/__manifest__.py
index 084490a16be..46fddd7c76b 100644
--- a/addons/mass_mailing_sale/__manifest__.py
+++ b/addons/mass_mailing_sale/__manifest__.py
@@ -12,7 +12,7 @@
         'views/mailing_mailing_views.xml',
     ],
     'demo': [
-        'data/mass_mailing_demo.xml',
+        'demo/mailing_mailing.xml',
     ],
     'auto_install': True,
     'license': 'LGPL-3',
diff --git a/addons/mass_mailing_sale/data/mass_mailing_demo.xml b/addons/mass_mailing_sale/demo/mailing_mailing.xml
similarity index 100%
rename from addons/mass_mailing_sale/data/mass_mailing_demo.xml
rename to addons/mass_mailing_sale/demo/mailing_mailing.xml
diff --git a/addons/mass_mailing_sms/__manifest__.py b/addons/mass_mailing_sms/__manifest__.py
index 83e20c94581..818721509d4 100644
--- a/addons/mass_mailing_sms/__manifest__.py
+++ b/addons/mass_mailing_sms/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'SMS Marketing',
     'summary': 'Design, send and track SMS',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Marketing/Email Marketing',
     'sequence': 245,
     'depends': [
@@ -13,7 +13,7 @@
         'sms',
     ],
     'data': [
-        'data/utm_data.xml',
+        'data/utm.xml',
         'security/ir.model.access.csv',
         'report/mailing_trace_report_views.xml',
         'views/mailing_list_views.xml',
@@ -27,9 +27,11 @@
         'wizard/mailing_sms_test_views.xml',
     ],
     'demo': [
-        'data/utm_demo.xml',
-        'data/mailing_list_demo.xml',
-        'data/mailing_demo.xml',
+        'demo/utm.xml',
+        'demo/mailing_list_contact.xml',
+        'demo/mailing_contact_subscription.xml',
+        'demo/mailing_mailing.xml',
+        'demo/mailing_trace.xml',
     ],
     'assets': {
         'web.assets_tests': [
diff --git a/addons/mass_mailing_sms/data/utm_data.xml b/addons/mass_mailing_sms/data/utm.xml
similarity index 100%
rename from addons/mass_mailing_sms/data/utm_data.xml
rename to addons/mass_mailing_sms/data/utm.xml
diff --git a/addons/mass_mailing_sms/demo/mailing_contact_subscription.xml b/addons/mass_mailing_sms/demo/mailing_contact_subscription.xml
new file mode 100644
index 00000000000..f0671cee8cc
--- /dev/null
+++ b/addons/mass_mailing_sms/demo/mailing_contact_subscription.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data noupdate="0">
+    <record id="mailing_list_sms_0_sub_contact_0_0" model="mailing.contact.subscription">
+        <field name="contact_id" ref="mass_mailing_sms.mailing_contact_0_0"/>
+        <field name="list_id" ref="mass_mailing_sms.mailing_list_sms_0"/>
+    </record>
+    <record id="mailing_list_sms_0_sub_contact_0_1" model="mailing.contact.subscription">
+        <field name="contact_id" ref="mass_mailing_sms.mailing_contact_0_1"/>
+        <field name="list_id" ref="mass_mailing_sms.mailing_list_sms_0"/>
+    </record>
+    <record id="mailing_list_sms_0_sub_contact_0_2" model="mailing.contact.subscription">
+        <field name="contact_id" ref="mass_mailing_sms.mailing_contact_0_2"/>
+        <field name="list_id" ref="mass_mailing_sms.mailing_list_sms_0"/>
+    </record>
+    <record id="mailing_list_sms_0_sub_contact_0_3" model="mailing.contact.subscription">
+        <field name="contact_id" ref="mass_mailing_sms.mailing_contact_0_3"/>
+        <field name="list_id" ref="mass_mailing_sms.mailing_list_sms_0"/>
+    </record>
+    <record id="mailing_list_sms_0_sub_contact_0_4" model="mailing.contact.subscription">
+        <field name="contact_id" ref="mass_mailing_sms.mailing_contact_0_4"/>
+        <field name="list_id" ref="mass_mailing_sms.mailing_list_sms_0"/>
+    </record>
+</data></odoo>
diff --git a/addons/mass_mailing_sms/data/mailing_list_demo.xml b/addons/mass_mailing_sms/demo/mailing_list_contact.xml
similarity index 72%
rename from addons/mass_mailing_sms/data/mailing_list_demo.xml
rename to addons/mass_mailing_sms/demo/mailing_list_contact.xml
index 885acd75990..e303c0cef93 100644
--- a/addons/mass_mailing_sms/data/mailing_list_demo.xml
+++ b/addons/mass_mailing_sms/demo/mailing_list_contact.xml
@@ -8,27 +8,27 @@
         <field name="name">Hubert Farnsworth</field>
         <field name="mobile">+32456001100</field>
         <field name="email">hubert.farnsworth@example.com</field>
-        <field name="list_ids" eval="[(4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="list_ids" eval="[(5, 0, 0)]"/>
     </record>
     <record id="mailing_contact_0_1" model="mailing.contact">
         <field name="name">Philip Fry</field>
         <field name="mobile">+32456001111</field>
         <field name="email">philip.fry@example.com</field>
-        <field name="list_ids" eval="[(4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="list_ids" eval="[(5, 0, 0)]"/>
     </record>
     <record id="mailing_contact_0_2" model="mailing.contact">
         <field name="name">Turanga Leela</field>
         <field name="mobile">+32456001122</field>
-        <field name="list_ids" eval="[(4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="list_ids" eval="[(5, 0, 0)]"/>
     </record>
     <record id="mailing_contact_0_3" model="mailing.contact">
         <field name="name">John Zoidberg</field>
         <field name="mobile">+32456001133</field>
-        <field name="list_ids" eval="[(4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="list_ids" eval="[(5, 0, 0)]"/>
     </record>
     <record id="mailing_contact_0_4" model="mailing.contact">
         <field name="name">Zapp Brannigan</field>
         <field name="mobile">dummy</field>
-        <field name="list_ids" eval="[(4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="list_ids" eval="[(5, 0, 0)]"/>
     </record>
 </data></odoo>
diff --git a/addons/mass_mailing_sms/demo/mailing_mailing.xml b/addons/mass_mailing_sms/demo/mailing_mailing.xml
new file mode 100644
index 00000000000..e751720982d
--- /dev/null
+++ b/addons/mass_mailing_sms/demo/mailing_mailing.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data noupdate="0">
+    <record id="mailing_sms_0" model="mailing.mailing">
+        <field name="name">XMas Promo</field>
+        <field name="subject">XMas Promo</field>
+        <field name="mailing_type">sms</field>
+        <field name="state">done</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        <field name="campaign_id" ref="utm_campaign_0"/>
+        <field name="mailing_model_id" ref="base.model_res_partner"/>
+        <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
+        <field name="body_plaintext">This week-end, incredible promotion for XMas! See http://sms.example.com!</field>
+    </record>
+    <!-- Generate link tracker information from it -->
+    <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing_sms.mailing_sms_0')]"/>
+
+    <record id="mailing_sms_1" model="mailing.mailing">
+        <field name="subject">Extra Promo</field>
+        <field name="mailing_type">sms</field>
+        <field name="state">done</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        <field name="campaign_id" ref="utm_campaign_0"/>
+        <field name="source_id" ref="mailing_sms_0_utm_source"/>
+        <field name="mailing_model_id" ref="mass_mailing.model_mailing_list"/>
+        <field name="contact_list_ids" eval="[(5, 0), (4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="body_plaintext">Extra promotion for you!</field>
+    </record>
+
+</data></odoo>
diff --git a/addons/mass_mailing_sms/data/mailing_demo.xml b/addons/mass_mailing_sms/demo/mailing_trace.xml
similarity index 82%
rename from addons/mass_mailing_sms/data/mailing_demo.xml
rename to addons/mass_mailing_sms/demo/mailing_trace.xml
index 66f01a4cdbf..1ad2a83ae1f 100644
--- a/addons/mass_mailing_sms/data/mailing_demo.xml
+++ b/addons/mass_mailing_sms/demo/mailing_trace.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data noupdate="0">
-    <record id="mailing_sms_0" model="mailing.mailing">
-        <field name="name">XMas Promo</field>
-        <field name="subject">XMas Promo</field>
-        <field name="mailing_type">sms</field>
-        <field name="state">done</field>
-        <field name="user_id" ref="base.user_admin"/>
-        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        <field name="campaign_id" ref="utm_campaign_0"/>
-        <field name="mailing_model_id" ref="base.model_res_partner"/>
-        <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
-        <field name="body_plaintext">This week-end, incredible promotion for XMas! See http://sms.example.com!</field>
-    </record>
-    <!-- Generate link tracker information from it -->
-    <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing_sms.mailing_sms_0')]"/>
     <!-- Simulate traces -->
     <record id="mailing_sms_0_trace_0" model="mailing.trace">
         <field name="mass_mailing_id" ref="mailing_sms_0"/>
@@ -121,21 +107,6 @@
         <value name="mailing_trace_id" eval="ref('mailing_sms_0_trace_2')"/>
     </function>
 
-    <record id="mailing_sms_0_utm_source" model="utm.source">
-        <field name="name">Mailing Extra Promo</field>
-    </record>
-    <record id="mailing_sms_1" model="mailing.mailing">
-        <field name="subject">Extra Promo</field>
-        <field name="mailing_type">sms</field>
-        <field name="state">done</field>
-        <field name="user_id" ref="base.user_admin"/>
-        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        <field name="campaign_id" ref="utm_campaign_0"/>
-        <field name="source_id" ref="mailing_sms_0_utm_source"/>
-        <field name="mailing_model_id" ref="mass_mailing.model_mailing_list"/>
-        <field name="contact_list_ids" eval="[(5, 0), (4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
-        <field name="body_plaintext">Extra promotion for you!</field>
-    </record>
     <!-- Simulate traces -->
     <record id="mailing_sms_1_trace_0" model="mailing.trace">
         <field name="mass_mailing_id" ref="mailing_sms_1"/>
diff --git a/addons/mass_mailing_sms/data/utm_demo.xml b/addons/mass_mailing_sms/demo/utm.xml
similarity index 80%
rename from addons/mass_mailing_sms/data/utm_demo.xml
rename to addons/mass_mailing_sms/demo/utm.xml
index 4fddf06f497..449599cb3e5 100644
--- a/addons/mass_mailing_sms/data/utm_demo.xml
+++ b/addons/mass_mailing_sms/demo/utm.xml
@@ -10,4 +10,7 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="tag_ids" eval="[(4, ref('mailing_tag_0')), (4, ref('utm.utm_tag_1'))]"/>
     </record>
+    <record id="mailing_sms_0_utm_source" model="utm.source">
+        <field name="name">Mailing Extra Promo</field>
+    </record>
 </data></odoo>