[MERGE] Sync with trunnk

bzr revid: tde@openerp.com-20140221145716-vkusdgd56rnc85rl

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

diff --cc addons/mail/wizard/mail_compose_message.py
index c8326ed,2d09a92..292bcad
--- 1/addons/mail/wizard/mail_compose_message.py
--- 2/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@@ -324,12 -323,13 +326,12 @@@ class mail_compose_message(osv.Transien
                  if email_dict.get('email_from'):
                      mail_values['email_from'] = email_dict.pop('email_from')
                  # replies redirection: mass mailing only
-                 if not wizard.same_thread:
-                     mail_values['reply_to'] = email_dict.pop('reply_to', None)
-                 else:
+                 if wizard.same_thread and wizard.post:
                      email_dict.pop('reply_to', None)
+                 else:
+                     mail_values['reply_to'] = email_dict.pop('reply_to', None)
                  mail_values.update(email_dict)
 -            # mass mailing without post: mail_mail values
 -            if mass_mail_mode and not wizard.post:
 +                # mail_mail values
                  if 'mail_auto_delete' in context:
                      mail_values['auto_delete'] = context.get('mail_auto_delete')
                  mail_values['body_html'] = mail_values.get('body', '')