diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index cf2f7d43a20..03f1078e6d5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -275,14 +275,6 @@
     display: none;
 }
 
-.openerp ul.oe_mail_debug {
-    color: #888;
-}
-
-.openerp ul.oe_mail_debug li {
-    margin-right: 12px;
-}
-
 /* ------------------------------------------------------------ */
 /* mail.compose.message form view & OpenERP hacks
 /* ------------------------------------------------------------ */
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 3872a486565..8ce050fd144 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -319,11 +319,11 @@ openerp.mail = function(session) {
         reinit: function() {
             var self = this;
             if (! this.form_view) return;
-            // debugger
             var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
                 function (result) {
                     self.form_view.on_processed_onchange({'value': result}, []);
                 });
+            return call_defer;
         },
 
         /**
@@ -586,12 +586,8 @@ openerp.mail = function(session) {
 
         do_customize_display: function() {
             if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
-            if (this.session.debug) {
-                this.$element.find('ul.oe_mail_debug').toggleClass('oe_mail_invisible');
-            }
         },
 
-
         /**
          * Bind events in the widget. Each event is slightly described
          * in the function. */
@@ -656,12 +652,6 @@ openerp.mail = function(session) {
                 self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
                 event.preventDefault();
             });
-            // event: click on "Debug data" in msg side menu (email style)
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_debug', 'click', function (event) {
-                var act_dom = $(event.srcElement).parents('div.oe_mail_msg_content').find('ul.oe_mail_debug');
-                act_dom.toggleClass('oe_mail_invisible');
-                event.preventDefault();
-            });
         },
         
         destroy: function () {
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5d76096fb9a..bf8d7fd1475 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -136,7 +136,6 @@
                         </li> -->
                         <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
-                        <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
@@ -147,27 +146,12 @@
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
                         <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
-                    <ul class="oe_mail_invisible oe_mail_debug">
-                        <li>document: (<t t-raw="record.model"/>,<t t-raw="record.res_id"/>)</li>
-                        <li>id: <t t-raw="record.id"/></li>
-                        <li>type: <t t-raw="record.type"/></li>
-                        <li>content_subtype: <t t-raw="record.content_subtype"/></li>
-                        <li>state: <t t-raw="record.state"/></li>
-                        <li>parent_id: <t t-raw="record.parent_id"/></li>
-                        <li>email_from: <t t-raw="record.email_from"/></li>
-                        <li>email_to: <t t-raw="record.email_to"/></li>
-                        <li>email_cc: <t t-raw="record.email_cc"/></li>
-                        <li>email_bcc: <t t-raw="record.email_bcc"/></li>
-                        <li>reply_to: <t t-raw="record.reply_to"/></li>
-                        <li>partner_ids: <t t-raw="record.partner_ids"/></li>
-                        <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
-                        <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
-                    </ul>
                     <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
                         <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
                         <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
                     </div>
+                    <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>