diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 4ba223f6c45..08cf45bffd4 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -10,8 +10,86 @@
             <field name="notification_email_send">none</field>
         </record>
 
+        <!-- demodata to make a search (comment, has attachment) on the sent view and get the context on click on expandable message -->
+        <record id="msg_discussion5_attach1" model="ir.attachment">
+            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
+            <field name="datas_fname">my_attachment.xls</field>
+            <field name="name">my_attachment.xls</field>
+        </record>
+        <record id="msg_discussion5" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="subject">Comment with attachment</field>
+            <field name="body">Demo data with attachment and others messages</field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="attachment_ids" eval="[(6, 0, [ref('msg_discussion5_attach1')])]"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_discussion5_message1" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="body"><![CDATA[<p>MESSAGE</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="parent_id" ref="msg_discussion5"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_discussion5_message2" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="body"><![CDATA[<p>MESSAGE</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="parent_id" ref="msg_discussion5"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_discussion5_message3" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="body"><![CDATA[<p>MESSAGE</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="parent_id" ref="msg_discussion5"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_discussion5_message4" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="body"><![CDATA[<p>MESSAGE</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="parent_id" ref="msg_discussion5"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_discussion5_attach2" model="ir.attachment">
+            <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
+            <field name="datas_fname">my_other_attachment.ai</field>
+            <field name="name">my_other_attachment.ai</field>
+        </record>
+        <record id="msg_discussion5_message5" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="body"><![CDATA[<p>MESSAGE</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="parent_id" ref="msg_discussion5"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="attachment_ids" eval="[(6, 0, [ref('msg_discussion5_attach2')])]"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_discussion5_message6" model="mail.message">
+            <field name="model">mail.thread</field>
+            <field name="body"><![CDATA[<p>MESSAGE</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="parent_id" ref="msg_discussion5"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="date" eval="(DateTime.today() - timedelta(days=23)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+
         <!-- Demo user and admin conversation -->
         <record id="message_discussion" model="mail.message">
+            <field name="model">mail.thread</field>
             <field name="body">Hello Demo User! I was wondering whether you had some issues with our secret task about putting cats everywhere in OpenERP.</field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
@@ -19,6 +97,7 @@
             <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root'), ref('base.partner_demo')])]"/>
         </record>
         <record id="message_discussion_answer1" model="mail.message">
+            <field name="model">mail.thread</field>
             <field name="body">No specific issues, I think everything is clear.</field>
             <field name="parent_id" ref="message_discussion"/>
             <field name="type">comment</field>
@@ -26,6 +105,7 @@
             <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_discussion_answer2" model="mail.message">
+            <field name="model">mail.thread</field>
             <field name="body">Ow, just to be sure... we were talking about lolcats, right ?</field>
             <field name="parent_id" ref="message_discussion"/>
             <field name="type">comment</field>
@@ -93,12 +173,13 @@
 
         <!-- Discussion: email and attachment -->
         <record id="msg_discussion2_0" model="mail.message">
+            <field name="model">mail.thread</field>
             <field name="subject">Plan to install servers</field>
-            <field name="model">mail.message</field>
             <field name="body"><![CDATA[<p>Hello,<br/>
-I am interested in your company's product and I plan to install 2 servers for my company.<br/>
-Can you please send me services catalogue?<br/>
-Virginie</p>]]></field>
+                I am interested in your company's product and I plan to install 2 servers for my company.<br/>
+                Can you please send me services catalogue?<br/>
+                Virginie</p>
+            ]]></field>
             <field name="type">email</field>
             <field name="subtype_id" ref="mt_comment"/>
             <field name="email_from">virginie@agrolait.fr</field>
@@ -106,10 +187,12 @@ Virginie</p>]]></field>
             <field name="notified_partner_ids" eval="[(6, 0, [ref('base.partner_demo'), ref('base.partner_root')])]"/>
             <field name="date" eval="(DateTime.today() - timedelta(minutes=14)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
+
+        <!-- for presentation the sales write this commented message with an attachment-->
         <!--record id="msg_discussion2_1_attach" model="ir.attachment">
             <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
-            <field name="datas_fname">catalogue 2012.pdf</field>
-            <field name="name">catalogue 2012.pdf</field>
+            <field name="datas_fname">catalogue.pdf</field>
+            <field name="name">catalogue.pdf</field>
         </record>
         <record id="msg_discussion2_1" model="mail.message">
             <field name="subject">Re: Plan to install servers</field>
@@ -249,6 +332,7 @@ Virginie</p>]]></field>
             <field name="date" eval="(DateTime.today() - timedelta(hours=3)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_discussion4_message1" model="mail.message">
+            <field name="model">res.partner</field>
             <field name="body">Thank you, the networks is perfect now ! Could you add a IP phone for Jhon ?</field>
             <field name="parent_id" ref="msg_discussion4"/>
             <field name="type">comment</field>
@@ -259,6 +343,7 @@ Virginie</p>]]></field>
             <field name="date" eval="(DateTime.today() - timedelta(hours=2, minutes=40)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
         <record id="msg_discussion4_message2" model="mail.message">
+            <field name="model">res.partner</field>
             <field name="body">It's right, his internal phone number is 0093</field>
             <field name="parent_id" ref="msg_discussion4"/>
             <field name="type">comment</field>
diff --git a/addons/mail/data/mail_group_demo_data.xml b/addons/mail/data/mail_group_demo_data.xml
index c81df963d50..41514d18d6c 100644
--- a/addons/mail/data/mail_group_demo_data.xml
+++ b/addons/mail/data/mail_group_demo_data.xml
@@ -27,35 +27,6 @@
             <field name="name">Support</field>
             <field name="description">Support team</field>
         </record>
-
-        <record id="message_group_0" model="mail.message">
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="mail.group_best_sales_practices"/>
-            <field name="body"><![CDATA[<p>MESSAGE UNREAD</p>]]></field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-        </record>
-        <record id="message_group_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>MESSAGE UNREAD</p>]]></field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-        </record>
-        <record id="message_group_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>MESSAGE UNREAD LIKED</p>]]></field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-        </record>
-        <record id="message_group_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>MESSAGE UNREAD LIKES</p>]]></field>
-            <field name="type">comment</field>
-            <field name="subtype_id" ref="mt_comment"/>
-        </record>
     </data>
 </openerp>