3 files changed, 16 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index 2f2e1a0e770..000353d1219 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -183,6 +183,12 @@ var Chatter = Widget.extend({
         this.$('.btn').prop('disabled', true); // disable buttons
     },
     /**
+     * @private
+     */
+    _disableComposer: function () {
+        this.$(".o_composer_button_send").prop('disabled', true);
+    },
+    /**
      * Discard changes on the record.
      *
      * @private
@@ -222,6 +228,12 @@ var Chatter = Widget.extend({
     /**
      * @private
      */
+    _enableComposer: function () {
+        this.$(".o_composer_button_send").prop('disabled', false);
+    },
+    /**
+     * @private
+     */
     _openAttachments: function () {
         var self = this;
         this.fields.attachments = new AttachmentBox(this, this.record);
@@ -268,6 +280,7 @@ var Chatter = Widget.extend({
             }
             self._composer.on('post_message', self, function (messageData) {
                 self._discardOnReload(messageData).then(function () {
+                    self._disableComposer();
                     self.fields.thread.postMessage(messageData).then(function () {
                         self._closeComposer(true);
                         if (self._reloadAfterPost(messageData)) {
@@ -275,6 +288,8 @@ var Chatter = Widget.extend({
                         } else if (messageData.attachment_ids.length) {
                             self.trigger_up('reload', {fieldNames: ['message_attachment_count']});
                         }
+                    }).fail(function () {
+                        self._enableComposer();
                     });
                 });
             });
diff --git a/addons/mail/static/src/js/composers/basic_composer.js b/addons/mail/static/src/js/composers/basic_composer.js
index 0e4d62232e2..a6cdb39e2de 100644
--- a/addons/mail/static/src/js/composers/basic_composer.js
+++ b/addons/mail/static/src/js/composers/basic_composer.js
@@ -390,7 +390,6 @@ var BasicComposer = Widget.extend({
             return;
         }
 
-        this.$(".o_composer_button_send").prop("disabled", true);
         clearTimeout(this._cannedTimeout);
         var self = this;
         this._preprocessMessage().then(function (message) {
diff --git a/addons/mail/static/src/js/composers/chatter_composer.js b/addons/mail/static/src/js/composers/chatter_composer.js
index d1a990b31e4..cda91eab205 100644
--- a/addons/mail/static/src/js/composers/chatter_composer.js
+++ b/addons/mail/static/src/js/composers/chatter_composer.js
@@ -45,7 +45,7 @@ var ChatterComposer = BasicComposer.extend({
      *
      * @override
      */
-    clearComposerOnSend: function () {},
+    _clearComposerOnSend: function () {},
 
     //--------------------------------------------------------------------------
     // Private