diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 07631cec992..a016586347f 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -1,10 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
 import ast
 import base64
+import datetime
 import email
 import logging
 import re
 import time
-import datetime
+import tools
 
 from osv import osv
 from osv import fields
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index e29988389df..d0c4ff55ee8 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -545,6 +545,7 @@ openerp.mail = function(session) {
         },
         
         message_post: function (body) {
+            var self = this;
             if (! body) {
                 var comment_node = this.$element.find('textarea');
                 var body = comment_node.val();