diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 24e3661703b..782e4a48812 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -4,7 +4,10 @@
 <!--
     <data noupdate="1">
 -->
-        <!-- Demo Leads -->
+        <!-- 
+            Demo Leads
+            -->
+
         <record id="crm_case_itisatelesalescampaign0" model="crm.lead">
             <field name="type_id" ref="crm.type_lead1"/>
             <field eval="'3'" name="priority"/>
@@ -215,12 +218,15 @@
         />
         <!--        Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
-            eval="[ ref('crm_case_imported_contact0'), ref('crm_case_employee0'),
-                    ref('crm_case_business_card0'), ref('crm_case_webvisitor0')],
-                  {'install_mode': True}"
+            eval="[ ref('crm_case_itisatelesalescampaign0'), ref('crm_case_electonicgoodsdealer0'),
+                    ref('crm_case_itdeveloper0'), ref('crm_case_employee0')], {}"
         />
 
-        <!-- Demo Opportunities -->
+
+        <!-- 
+            Demo Opportunities
+            -->
+
         <record id="crm_case_construstazunits0" model="crm.lead">
             <field eval="60" name="probability"/>
             <field eval="1" name="active"/>
@@ -354,7 +360,7 @@
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor5"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
-            <field eval="'Need new design for my website'" name="name"/>
+            <field eval="'Need a new design for my website'" name="name"/>
             <field eval="time.strftime('%Y-05-01')" name="date_action"/>
             <field eval="time.strftime('%Y-06-30')" name="date_deadline"/>
             <field eval="'info@opensides.be'" name="email_from"/>
@@ -425,7 +431,7 @@
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="categ_id" ref="crm.categ_oppor1"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
-            <field eval="'Need customize the solution'" name="name"/>
+            <field eval="'Need to customize the solution'" name="name"/>
             <field eval="'Conf call with technical service'" name="title_action"/>
             <field name="partner_name">Thymbra</field>
             <field name="street">Palermo, Capital Federal</field>
@@ -478,5 +484,12 @@
             <field name="stage_id" ref="crm.stage_lead1"/>
             <field eval="'Need more info about your pc2'" name="name"/>
         </record>
+
+        <!--        Call Function to set the opportunities as Unread -->
+        <function model="crm.lead" name="message_mark_as_unread"
+            eval="[ ref('crm_case_rdroundfundingunits25'), ref('crm_case_unifliege'),
+                    ref('crm_case_ericdubois4'), ref('crm_case_abcfuelcounits0')], {}"
+        />
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 80cb1fd052a..9672aa54c16 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -385,6 +385,10 @@
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft" type="object" />
+                    <button name="message_mark_as_unread" string="Mark Unread" type="object"
+                            attrs="{'invisible':[('message_thread_read', '==', False)]}"/>
+                    <button name="message_mark_as_read" string="Mark Read" type="object"
+                            attrs="{'invisible':[('message_thread_read', '==', True)]}"/>
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
@@ -399,6 +403,9 @@
                     <div class="oe_form_title">
                         <label for="name" class="oe_form_readonly_hidden"/>
                         <h1><field name="name"/></h1>
+                        <newline/>
+                        <field name="message_thread_read"/>
+                        <newline/>
 
                         <label for="planned_revenue" class="oe_form_readonly_hidden"/>
                         <h2>