diff --git a/addons/mail/data/mail_group_demo_data.xml b/addons/mail/data/mail_group_demo_data.xml
index 66c9d156a3b..b8b1520471d 100644
--- a/addons/mail/data/mail_group_demo_data.xml
+++ b/addons/mail/data/mail_group_demo_data.xml
@@ -19,15 +19,15 @@
             <field name="message_follower_ids" eval="[(6, 0, [])]"/>
         </record>
         <record model="mail.group" id="group_rd">
-            <field name="name">RD</field>
+            <field name="name">R&amp;D</field>
             <field name="description">Research and development discussion group</field>
         </record>
         <record model="mail.group" id="group_rd">
             <field name="message_follower_ids" eval="[(6, 0, [])]"/>
         </record>
         <record model="mail.group" id="group_leasing">
-            <field name="name">Leasing</field>
-            <field name="description">Leasing, cars and fuel cards</field>
+            <field name="name">HR Policies</field>
+            <field name="description">Company cars, holidays and other advantages</field>
         </record>
         <record model="mail.group" id="group_support">
             <field name="name">Support</field>
@@ -38,7 +38,7 @@
         <record id="msg_group_1_1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_best_sales_practices"/>
-            <field name="body"><![CDATA[<p>BEST SALE PRACTICE</p>]]></field>
+            <field name="body"><![CDATA[<p>Selling a training session and selling the products after the training session is more efficient than directly selling a pack with the training session and the products.</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
@@ -47,7 +47,7 @@
         <record id="msg_group_1_2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_best_sales_practices"/>
-            <field name="body"><![CDATA[<p>BEST SALE PRACTICE</p>]]></field>
+            <field name="body"><![CDATA[<p>I noted I can not manage efficiently my pipeline when I have more than 50 opportunities in the qualification stage.</p><p>Any advice on this? How do you organize your activities with more than 50 opportunities?</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
@@ -56,8 +56,9 @@
         <record id="msg_group_1_3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_best_sales_practices"/>
-            <field name="body"><![CDATA[<p>BEST SALE PRACTICE</p>]]></field>
+            <field name="body"><![CDATA[<p>When I have too much opportunities in the pipe, I start communicating with prospects more by email than phonecalls.</p><p>I send an email to create a sense of emergency, like <i>"can I call you this week about our quote?"</i> and I call only those that answer this email.</p><p>You can use the email template feature of OpenERP to automate email composition.</p>]]></field>
             <field name="type">comment</field>
+            <field name="parent_id" ref="msg_group_1_2"/>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
             <field name="vote_user_ids" eval="[(6, 0, [ref('base.user_demo')])]"/>
@@ -66,7 +67,7 @@
         <record id="msg_group_1_4" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_best_sales_practices"/>
-            <field name="body"><![CDATA[<p>BEST SALE PRACTICE</p>]]></field>
+            <field name="body"><![CDATA[<p>When you sell a tablet PC, don't forget to propose a docking station with it. I offer 20% on the docking stating (not the tablet) and I have a 70% success rate with this combo.</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
@@ -80,7 +81,7 @@
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at the HR's office.</p>]]></field>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.partner_root"/>
+            <field name="author_id" ref="base.partner_demo"/>
             <field name="date" eval="(DateTime.today() - timedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_empl_1_1" model="mail.message">
@@ -89,7 +90,7 @@
             <field name="body"><![CDATA[<p>Oh, I had forgotten. This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</p>]]></field>
             <field name="parent_id" ref="msg_empl_1"/>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.partner_root"/>
+            <field name="author_id" ref="base.partner_demo"/>
             <field name="date" eval="(DateTime.today() - timedelta(minutes=57)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_empl_1_2" model="mail.message">
@@ -98,7 +99,7 @@
             <field name="body"><![CDATA[<p>Thanks! Could you please remind me where is Christine's office, if I may ask? I'm new here!</p>]]></field>
             <field name="parent_id" ref="msg_empl_1"/>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.partner_demo"/>
+            <field name="author_id" ref="base.partner_root"/>
             <field name="date" eval="(DateTime.today() - timedelta(minutes=34)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_empl_1_3" model="mail.message">
@@ -107,18 +108,8 @@
             <field name="body"><![CDATA[<p>Building B3, second floor on the right :-).</p>]]></field>
             <field name="parent_id" ref="msg_empl_1"/>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.partner_root"/>
-            <field name="date" eval="(DateTime.today() - timedelta(minutes=22)).strftime('%Y-%m-%d %H:%M')"/>
-        </record>
-        <record id="msg_empl_1_4" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Many thanks. Actually that's good news, next year I'll have to buy a new fridge, I think I will pay it with the eco-vouchers!</p>]]></field>
-            <field name="parent_id" ref="msg_empl_1"/>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
-            <field name="date" eval="(DateTime.today() - timedelta(minutes=9)).strftime('%Y-%m-%d %H:%M')"/>
+            <field name="date" eval="(DateTime.today() - timedelta(minutes=22)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
     </data>