diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index aea7ee62cbc..b34993ffd32 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -22,12 +22,12 @@
 import mail_message_subtype
 import mail_alias
 import mail_followers
+import mail_vote
+import mail_favorite
 import mail_message
 import mail_mail
 import mail_thread
 import mail_group
-import mail_vote
-import mail_favorite
 import res_partner
 import res_users
 import report
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 4b553a1e220..89fb57dda6f 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -12,7 +12,6 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
         </record>
-
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
@@ -21,7 +20,6 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
         </record>
-
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
@@ -30,7 +28,7 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
         </record>
-
+        <!-- This one is starred for having mailboxes with demo data -->
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
@@ -38,8 +36,8 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="favorite_user_ids" eval="[(6, 0, [ref('base.user_root'), ref('base.user_demo')])]"/>
         </record>
-
         <record id="message_blogpost0_comment3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
@@ -51,14 +49,14 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
 
         <!-- Demo user and admin conversation -->
         <record id="message_discussion" model="mail.message">
-            <field name="body">Hello Demo User! How are you ?</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"/>
             <field name="author_id" ref="base.partner_root"/>
             <field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
         </record>
         <record id="message_discussion_answer1" model="mail.message">
-            <field name="body">Fine, thanks, and you ?</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>
             <field name="subtype_id" ref="mt_comment"/>
@@ -66,7 +64,15 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root')])]"/>
         </record>
         <record id="message_discussion_answer2" model="mail.message">
-            <field name="body">Fine too.</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>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root')])]"/>
+        </record>
+        <record id="message_discussion_answer3" model="mail.message">
+            <field name="body">Absolutely!</field>
             <field name="parent_id" ref="message_discussion"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index cd35b37d812..46c3bc9fcc2 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -125,7 +125,8 @@ class mail_message(osv.Model):
             help="Author of the message. If not set, email_from may hold an email address that did not match any partner."),
         'partner_ids': fields.many2many('res.partner', string='Recipients'),
         'notified_partner_ids': fields.many2many('res.partner', 'mail_notification',
-            'message_id', 'partner_id', 'Recipients'),
+            'message_id', 'partner_id', 'Notified partners',
+            help='Partners that have a notification pushing this message in their mailboxes'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
         'parent_id': fields.many2one('mail.message', 'Parent Message', select=True, ondelete='set null', help="Initial thread message."),