[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121129113658-x23z7w5e54mr4j9v

diff --cc addons/mail/mail_thread.py
Simple merge

diff --cc addons/mail/mail_thread_view.xml
index fedcef3,4106eb2..80b9800
--- 1/addons/mail/mail_thread_view.xml
--- 2/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@@ -39,11 -40,10 +39,12 @@@
                'search_default_message_unread': True
              }</field>
              <field name="params" eval="&quot;{
 -                'domain': [('partner_ids.user_ids', 'in', [uid])],
 +                'domain': [
 +                    ('partner_ids.user_ids', 'in', [uid])
 +                ],
                  'view_mailbox': True,
-                 'read_action': 'read', }&quot;"/>
+                 'read_action': 'read',
+                 'show_compose_message': False }&quot;"/>
              <field name="help" type="html">
                  <p>
                      <b>No private message.</b>
@@@ -63,11 -63,10 +64,12 @@@
                'search_default_message_unread': True
              }</field>
              <field name="params" eval="&quot;{
 -                'domain': [('favorite_user_ids', 'in', [uid])],
 +                'domain': [
 +                    ('starred', '=', True),
 +                ],
                  'view_mailbox': True,
-                 'read_action': 'read', }&quot;"/>
+                 'read_action': 'read',
+                 'compose_as_todo': True }&quot;"/>
              <field name="help" type="html">
                  <p>
                      <b>No todo.</b>
@@@ -86,12 -85,9 +88,13 @@@
                'default_res_id': uid
              }</field>
              <field name="params" eval="&quot;{
 -                'domain': ['|', ('notification_ids.partner_id.user_ids', 'in', [uid]), ('author_id.user_ids', 'in', [uid])],
 +                'domain': [
 +                    '|',
 +                    ('notification_ids.partner_id.user_ids', 'in', [uid]),
 +                    ('author_id.user_ids', 'in', [uid]),
 +                ],
-                 'view_mailbox': True, }&quot;"/>
+                 'view_mailbox': True,
+                 'show_compose_message': False }&quot;"/>
              <field name="help" type="html">
                  <p>
                      No message found and no message sent yet.

diff --cc addons/mail/static/src/js/mail.js
Simple merge