From 1284c5c0d4e0c82843a74fafe00de5d677cf0bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 25 Nov 2013 16:58:57 +0100
Subject: [PATCH] [FIX] mail: fixed reply button in mail_mail form view, should
 reply to a mail.message, not a mail.mail.

lp bug: https://launchpad.net/bugs/1212190 fixed

bzr revid: tde@openerp.com-20131125155857-m04233fbyan7mglt
---
 addons/mail/mail_mail_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index fb2b66adb36..e0d1f3e96b2 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -7,12 +7,13 @@
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
                     <sheet>
+                        <field name="mail_message_id" required="0" invisible="1"/>
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>
                         <div>
                             by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
                             <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                context="{'default_composition_mode':'reply', 'default_parent_id': active_id}" states='received,sent,exception,cancel'/>
+                                context="{'default_composition_mode':'reply', 'default_parent_id': mail_message_id}" states='received,sent,exception,cancel'/>
                         </div>
                         <notebook colspan="4">
                             <page string="Message Details">