diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index d9f6cb1d1bc..fd4e6e02ef7 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -2,13 +2,21 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="mass_mail_attach_1" model="ir.attachment">
+            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
+            <field name="datas_fname">SampleDoc.doc</field>
+            <field name="name">SampleDoc.doc</field>
+        </record>
+
         <record id="mass_mail_template_1" model="email.template">
-            <field name="name">Partner Newsletter 1</field>
+            <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>
             <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field>
             <field name="use_in_mass_mailing" eval="True"/>
+            <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>
@@ -58,71 +66,6 @@
 </div>]]></field>
         </record>
 
-        <record id="mass_mail_template_2" model="email.template">
-            <field name="name">Partner Newsletter 2</field>
-            <field name="model_id" ref="base.model_res_partner"/>
-            <field name="auto_delete" eval="False"/>
-            <field name="partner_to">${object.id}</field>
-            <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field>
-            <field name="use_in_mass_mailing" eval="True"/>
-            <field name="body_html"><![CDATA[<div data-snippet-id="text-image" style="padding:0px; margin:0px">
-<table cellpadding="0" cellspacing="0" style="margin:10px 0px 0px;vertical-align:top;padding:0px 5px;font-family:arial;font-size:12px;color:rgb(51,51,51)">
-    <tbody>
-        <tr>
-            <td style="width:600px" valign="top">
-            <div style="padding:0px 5px">
-            <h1 style="text-align: center">Sell Online. Easily.</h1>
-
-            <p style="overflow:hidden">Write one sentence to convince visitor about your message.</p>
-            </div>
-            </td>
-        </tr>
-    </tbody>
-</table>
-</div>
-<div data-snippet-id="hr" 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>
-        <tr>
-            <td style="width:600px" valign="top">
-            <div style="padding:0px 5px">
-            <hr style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0" width="100%" data-snippet-id="hr"></div>
-            </td>
-        </tr>
-    </tbody>
-</table>
-</div>
-
-<div data-snippet-id="three-columns" 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>
-        <tr>
-            <td style="width:200px" valign="top"><img src="/website/static/src/img/desert_thumb.jpg" style="display:block;border:none;min-height:50px" width="175"></td>
-            <td style="width:200px" valign="top"><img src="/website/static/src/img/deers_thumb.jpg" style="display:block;border:none;min-height:50px" width="175"></td>
-            <td style="width:200px" valign="top"><img src="/website/static/src/img/china_thumb.jpg" style="display:block;border:none;min-height:50px" width="175"></td>
-        </tr>
-        <tr>
-            <td style="width:200px" valign="top">
-            <h3 style="text-align: center; padding:0px 5px">Feature One</h3>
-
-            <p style="overflow:hidden">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</p>
-            </td>
-            <td style="width:200px" valign="top">
-            <h3 style="text-align: center; padding:0px 5px">Feature Two</h3>
-
-            <p style="overflow:hidden">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</p>
-            </td>
-            <td style="width:200px" valign="top">
-            <h3 style="text-align: center; padding:0px 5px">Feature Three</h3>
-
-            <p style="overflow:hidden">Choose a vibrant image and write an inspiring paragraph about it. It does not have to be long, but it should reinforce your image.</p>
-            </td>
-        </tr>
-    </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>
@@ -174,7 +117,7 @@
         <record id="mass_mail_2" model="mail.mass_mailing">
             <field name="name">Second Newsletter</field>
             <field name="state">test</field>
-            <field name="template_id" eval="ref('mass_mail_template_2')"/>
+            <field name="template_id" eval="ref('mass_mail_template_1')"/>
             <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>