diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 3244e047da4..f196b1c48a4 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -5,46 +5,50 @@
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
-            <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.
-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="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Great.</p>]]></field>
+            <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="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Thanks, but where is Christine's office, if I may ask? (I'm new here)</p>]]></field>
+            <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="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-)</p>]]></field>
+            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-).</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_blogpost0_comment3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[<p>Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</p>]]></field>
+            <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="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
     </data>
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index d40837d4c0b..5ab4bdd7365 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -2,21 +2,26 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Create a portal member attached to a partner -->
-        <record id="demo_user0" model="res.users">
+        <!-- Create a partner, that is also a portal user -->
+        <record id="partner_demo_portal" model="res.partner">
             <field name="name">Demo Portal User</field>
-            <field name="login">portal</field>
-            <field name="password">portal</field>
-            <!-- Avoid auto-including this user in any default group -->
-            <field name="groups_id" eval="[(5,)]"/>
+            <field name="email">demo@portal.example.com</field>
             <field name="supplier" eval="False"/>
             <field name="customer" eval="True"/>
-            <field name="email">demo@portal.wrong.address</field>
+        </record>
+        <record id="user_demo_portal" model="res.users">
+            <field name="partner_id" ref="partner_demo_portal"/>
+            <field name="login">portal</field>
+            <field name="password">portal</field>
+            <field name="signature">--
+Mr Demo Portal</field>
+            <!-- Avoid auto-including this user in any default group -->
+            <field name="groups_id" eval="[(5,)]"/>
         </record>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
         <record id="group_portal" model="res.groups">
-            <field name="users" eval="[(4,ref('demo_user0'))]"/>
+            <field name="users" eval="[(4,ref('user_demo_portal'))]"/>
         </record>
 
         <!-- Company news and comments -->
@@ -25,29 +30,40 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
             <field name="body"><![CDATA[<p>Hello, and welcome to our company's portal !</p>
-<p>Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.</p>
-<p>Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.</p>
-<p>Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.</p>]]></field>
+<p>It is a great pleasure to announce you the creation of our portal by writing this first news! As you may have seen, a new discussion group is now present under your 'My groups' menu: <b>Company's News</b>. We will post news about the company and its employees in this discussion group. Moreover, we will be able to communicate with our partners that are given the opportunity to join us in our portal.</p>
+<p>A new era of communication has begun! <b>Feel free to post your feelings about our portal by replying on this message!</b></p>]]></field>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[<p>Great first blogpost!</p>]]></field>
+            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="author_id" ref="base.res_partner_1"/>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="partner_demo_portal"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[<p>Thanks!</p>]]></field>
+            <field name="body"><![CDATA[<p>That's good news! As said by <i>Demo Portal User</i> in the previous post, I'm looking forward to hearing from you!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="base.res_partner_1"/>
+        </record>
+
+        <record id="message_company_news0_comment2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="body"><![CDATA[<p>This feature is realy great! We will be able to communicate directly to our partners!</p>]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
         </record>