[MERGE] Merged with mail-state-tde, recently updated with trunk.

bzr revid: tde@openerp.com-20120620074229-bb2ahofjrggppcjf

diff --cc addons/crm/crm_lead_view.xml
index d8a1929,774c2f6..78a3229
--- 1/addons/crm/crm_lead_view.xml
--- 2/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -107,9 -107,8 +107,9 @@@
                              string="Phone Calls" />
                      </div>
  
-                     <label for="name" class="oe_form_readonly_hidden" string="Lead Description"/>
+                     <label for="name" class="oe_edit_only" string="Lead Description"/>
                      <h1><field name="name" placeholder="Describe the lead..."/></h1>
 +                    <newline/>
                      <field name="message_thread_read"/>
                      <newline/>
                      <group>

diff --cc addons/mail/mail_message_view.xml
index b8cf9d0,339c8fb..87c43bb
--- 1/addons/mail/mail_message_view.xml
--- 2/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@@ -108,14 -82,16 +108,14 @@@
              <field name="arch" type="xml">
                  <form string="Email message" version="7.0">
                      <sheet>
-                         <label for="subject" class="oe_form_readonly_hidden"/>
+                         <label for="subject" class="oe_edit_only"/>
                          <h1><field name="subject"/></h1>
-                         <label for="user_id" class="oe_form_readonly_hidden"/>
-                         <h2><field name="user_id" class="oe_form_inline" string="User"/> on <field name="date" class="oe_form_inline"/></h2>
 -                        <label for="user_id"/>
++                                              <label for="user_id"/>
+                         <h2><field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/></h2>
 -                        <group col="4">
 -                            <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
 -                            <field name="type"/>
 -                        </group>
 +                        <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
 +                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
                          <notebook colspan="4">
 -                            <page string="Details">
 +                            <page string="Message Details">
                                  <group string="Recipients">
                                      <field name="email_from"/>
                                      <field name="email_to"/>