diff --git a/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-debug.js b/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-debug.js
index 20c85f10287..1c604a86d5e 100644
--- a/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-debug.js
+++ b/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-debug.js
@@ -351,19 +351,18 @@ Y.namespace('M.core_message.messenger').sendMessage = Y.extend(SENDMSGDIALOG, M.
 
                     // Hide the dialog.
                     Y.later(1300, this, function() {
+                        this.setSendLock(false);
                         this.hideNotice();
                         this.hide();
                     });
                 },
                 failure: function() {
+                    this.setSendLock(false);
                     this.hideNotice();
                     new M.core.alert({
                         title: M.util.get_string('error', 'core'),
                         message: M.util.get_string('errorwhilesendingmessage', 'core_message')
                     });
-                },
-                complete: function() {
-                    this.setSendLock(false);
                 }
             },
             context: this
diff --git a/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-min.js b/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-min.js
index ce03bffc1a1..82fe4150380 100644
--- a/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-min.js
+++ b/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger-min.js
@@ -1 +1 @@
-YUI.add("moodle-core_message-messenger",function(e,t){var n={},r={};r.MANAGER={SENDMESSAGE:'[data-trigger="core_message-messenger::sendmessage"]'};var i=function(){i.superclass.constructor.apply(this,arguments)};e.namespace("M.core_message.messenger").Manager=e.extend(i,e.Base,{_sendMessageDialog:null,_events:[],initializer:function(){this._setEvents()},sendMessage:function(t,n,r){var i;this._sendMessageDialog||(i=e.namespace("M.core_message.messenger.sendMessage"),this._sendMessageDialog=new i({url:this.get("url")})),this._sendMessageDialog.prepareForUser(t,n),this._sendMessageDialog.show(r)},_setEvents:function(){var t=function(e){var t=e.currentTarget,n=parseInt(t.getData("userid"),10),r=t.getData("fullname");if(!n||!r)return;e.preventDefault(),this.sendMessage(n,r,e)};this._events.push(e.delegate("click",t,"body",r.MANAGER.SENDMESSAGE,this)),this._events.push(e.one(e.config.doc).delegate("key",t,"space",r.MANAGER.SENDMESSAGE,this))}},{NAME:"core_message-messenger-manager",ATTRS:{url:{readonly:!0,value:M.cfg.wwwroot+"/message/ajax.php"}}});var s;e.namespace("M.core_message.messenger").init=function(e){return s||(s=new i(e)),s},n.SENDMSGDIALOG={ACCESSHIDE:"accesshide",ACTIONS:"message-actions",FOOTER:"message-footer",HIDDEN:"hidden",HISTORYLINK:"message-history",INPUT:"message-input",INPUTAREA:"message-area",NOTICE:"message-notice",NOTICEAREA:"message-notice-area",PREFIX:"core_message-messenger-sendmessage",SENDBTN:"message-send",WRAPPER:"message-wrapper"},r.SENDMSGDIALOG={FORM:"form",HISTORYLINK:".message-history",INPUT:".message-input",NOTICE:".message-notice div",NOTICEAREA:".message-notice-area",SENDBTN:".message-send"};var o=function(){o.superclass.constructor.apply(this,arguments)};e.namespace("M.core_message.messenger").sendMessage=e.extend(o,M.core.dialogue,{_bb:null,_sendLock:!1,initializer:function(){var t,r;this._bb=this.get("boundingBox"),t=e.Handlebars.compile('<form action="#"><div class="{{CSSR.INPUTAREA}}"><label class="{{CSSR.ACCESSHIDE}}" for="{{id}}">{{labelStr}}</label><textarea class="{{CSSR.INPUT}}" id="{{id}}"></textarea><div class="{{CSSR.NOTICEAREA}}" style="display: none;" aria-live="assertive"><div class="{{CSSR.NOTICE}}"><div></div></div></div></div><div class="{{CSSR.ACTIONS}}"><input type="submit" value="{{sendStr}}" class="{{CSSR.SENDBTN}}"><a href="#" class="{{CSSR.HISTORYLINK}}">{{viewHistoryStr}}</a><div style="clear: both;"></div></div></form>'),r=e.Node.create(t({CSSR:n.SENDMSGDIALOG,id:e.guid(),labelStr:M.util.get_string("messagetosend","core_message"),loadingIcon:M.util.image_url("i/loading","moodle"),sendStr:M.util.get_string("sendmessage","core_message"),viewHistoryStr:M.util.get_string("viewconversation","core_message")})),this.setStdModContent(e.WidgetStdMod.BODY,r,e.WidgetStdMod.REPLACE),this._bb.one(".moodle-dialogue-wrap").addClass("moodle-dialogue-content"),this._setEvents()},prepareForUser:function(t,n){var i;this.set("userid",t),this.set("fullname",n),i=e.Node.create("<h1>"+e.Escape.html(n)+"</h1>"),this.setStdModContent(e.WidgetStdMod.HEADER,i,e.WidgetStdMod.REPLACE),this._bb.one(r.SENDMSGDIALOG.HISTORYLINK).set("href",M.cfg.wwwroot+"/message/index.php?id="+this.get("userid")),this._bb.one(r.SENDMSGDIALOG.INPUT).set("value","")},sendMessage:function(t){if(this._sendLock)return;if(!t||!this._validateMessage(t))return;this._ioSend=e.io(this.get("url"),{method:"POST",data:{sesskey:M.cfg.sesskey,action:"sendmessage",userid:this.get("userid"),message:t},on:{start:function(){var e='<img alt="" role="presentation" src="'+M.util.image_url("i/loading_small","moodle")+'">';this.setSendLock(!0),this.showNotice(e+" "+M.util.get_string("sendingmessage","core_message"))},success:function(t,n){var r=null;try{r=e.JSON.parse(n.responseText);if(r.error){this.hideNotice(),new M.core.ajaxException(r);return}}catch(i){this.hideNotice(),new M.core.exception(i);return}this.showNotice(M.util.get_string("messagesent","core_message")),e.later(1300,this,function(){this.hideNotice(),this.hide()})},failure:function(){this.hideNotice(),new M.core.alert({title:M.util.get_string("error","core"),message:M.util.get_string("errorwhilesendingmessage","core_message")})},complete:function(){this.setSendLock(!1)}},context:this})},hideNotice:function(){this._bb.one(r.SENDMSGDIALOG.NOTICEAREA).hide()},showNotice:function(e){this._bb.one(r.SENDMSGDIALOG.NOTICE).setHTML(e),this._bb.one(r.SENDMSGDIALOG.NOTICEAREA).show()},setSendLock:function(e){e?this._sendLock=!0:this._sendLock=!1},_setEvents:function(){this._bb.one(r.SENDMSGDIALOG.FORM).on("submit",function(e){var t=this._bb.one(r.SENDMSGDIALOG.INPUT).get("value");e.preventDefault(),this.sendMessage(t)},this)},_validateMessage:function(e){var t;return e?(t=e.replace(" ","").replace("&nbsp;","").replace(/(<br\s*\/?>(<\/br\s*\/?>)?)+/,"").trim(),t.length>1):!1}},{NAME:"core_message-messenger-sendmessage",CSS_PREFIX:n.SENDMSGDIALOG.PREFIX,ATTRS:{fullname:{validator:e.Lang.isString,value:""},url:{validator:e.Lang.isString,value:null},userid:{validator:e.Lang.isNumber,value:0}}}),e.Base.modifyAttrs(e.namespace("M.core_message.messenger.sendMessage"),{extraClasses:{value:["core_message-messenger-sendmessage"]},focusOnPreviousTargetAfterHide:{value:!0},width:{value:"360px"},visible:{value:!1},modal:{value:!0},draggable:{value:!1},center:{value:!0}})},"@VERSION@",{requires:["escape","handlebars","io-base","moodle-core-notification-ajaxexception","moodle-core-notification-alert","moodle-core-notification-dialogue","moodle-core-notification-exception"]});
+YUI.add("moodle-core_message-messenger",function(e,t){var n={},r={};r.MANAGER={SENDMESSAGE:'[data-trigger="core_message-messenger::sendmessage"]'};var i=function(){i.superclass.constructor.apply(this,arguments)};e.namespace("M.core_message.messenger").Manager=e.extend(i,e.Base,{_sendMessageDialog:null,_events:[],initializer:function(){this._setEvents()},sendMessage:function(t,n,r){var i;this._sendMessageDialog||(i=e.namespace("M.core_message.messenger.sendMessage"),this._sendMessageDialog=new i({url:this.get("url")})),this._sendMessageDialog.prepareForUser(t,n),this._sendMessageDialog.show(r)},_setEvents:function(){var t=function(e){var t=e.currentTarget,n=parseInt(t.getData("userid"),10),r=t.getData("fullname");if(!n||!r)return;e.preventDefault(),this.sendMessage(n,r,e)};this._events.push(e.delegate("click",t,"body",r.MANAGER.SENDMESSAGE,this)),this._events.push(e.one(e.config.doc).delegate("key",t,"space",r.MANAGER.SENDMESSAGE,this))}},{NAME:"core_message-messenger-manager",ATTRS:{url:{readonly:!0,value:M.cfg.wwwroot+"/message/ajax.php"}}});var s;e.namespace("M.core_message.messenger").init=function(e){return s||(s=new i(e)),s},n.SENDMSGDIALOG={ACCESSHIDE:"accesshide",ACTIONS:"message-actions",FOOTER:"message-footer",HIDDEN:"hidden",HISTORYLINK:"message-history",INPUT:"message-input",INPUTAREA:"message-area",NOTICE:"message-notice",NOTICEAREA:"message-notice-area",PREFIX:"core_message-messenger-sendmessage",SENDBTN:"message-send",WRAPPER:"message-wrapper"},r.SENDMSGDIALOG={FORM:"form",HISTORYLINK:".message-history",INPUT:".message-input",NOTICE:".message-notice div",NOTICEAREA:".message-notice-area",SENDBTN:".message-send"};var o=function(){o.superclass.constructor.apply(this,arguments)};e.namespace("M.core_message.messenger").sendMessage=e.extend(o,M.core.dialogue,{_bb:null,_sendLock:!1,initializer:function(){var t,r;this._bb=this.get("boundingBox"),t=e.Handlebars.compile('<form action="#"><div class="{{CSSR.INPUTAREA}}"><label class="{{CSSR.ACCESSHIDE}}" for="{{id}}">{{labelStr}}</label><textarea class="{{CSSR.INPUT}}" id="{{id}}"></textarea><div class="{{CSSR.NOTICEAREA}}" style="display: none;" aria-live="assertive"><div class="{{CSSR.NOTICE}}"><div></div></div></div></div><div class="{{CSSR.ACTIONS}}"><input type="submit" value="{{sendStr}}" class="{{CSSR.SENDBTN}}"><a href="#" class="{{CSSR.HISTORYLINK}}">{{viewHistoryStr}}</a><div style="clear: both;"></div></div></form>'),r=e.Node.create(t({CSSR:n.SENDMSGDIALOG,id:e.guid(),labelStr:M.util.get_string("messagetosend","core_message"),loadingIcon:M.util.image_url("i/loading","moodle"),sendStr:M.util.get_string("sendmessage","core_message"),viewHistoryStr:M.util.get_string("viewconversation","core_message")})),this.setStdModContent(e.WidgetStdMod.BODY,r,e.WidgetStdMod.REPLACE),this._bb.one(".moodle-dialogue-wrap").addClass("moodle-dialogue-content"),this._setEvents()},prepareForUser:function(t,n){var i;this.set("userid",t),this.set("fullname",n),i=e.Node.create("<h1>"+e.Escape.html(n)+"</h1>"),this.setStdModContent(e.WidgetStdMod.HEADER,i,e.WidgetStdMod.REPLACE),this._bb.one(r.SENDMSGDIALOG.HISTORYLINK).set("href",M.cfg.wwwroot+"/message/index.php?id="+this.get("userid")),this._bb.one(r.SENDMSGDIALOG.INPUT).set("value","")},sendMessage:function(t){if(this._sendLock)return;if(!t||!this._validateMessage(t))return;this._ioSend=e.io(this.get("url"),{method:"POST",data:{sesskey:M.cfg.sesskey,action:"sendmessage",userid:this.get("userid"),message:t},on:{start:function(){var e='<img alt="" role="presentation" src="'+M.util.image_url("i/loading_small","moodle")+'">';this.setSendLock(!0),this.showNotice(e+" "+M.util.get_string("sendingmessage","core_message"))},success:function(t,n){var r=null;try{r=e.JSON.parse(n.responseText);if(r.error){this.hideNotice(),new M.core.ajaxException(r);return}}catch(i){this.hideNotice(),new M.core.exception(i);return}this.showNotice(M.util.get_string("messagesent","core_message")),e.later(1300,this,function(){this.setSendLock(!1),this.hideNotice(),this.hide()})},failure:function(){this.setSendLock(!1),this.hideNotice(),new M.core.alert({title:M.util.get_string("error","core"),message:M.util.get_string("errorwhilesendingmessage","core_message")})}},context:this})},hideNotice:function(){this._bb.one(r.SENDMSGDIALOG.NOTICEAREA).hide()},showNotice:function(e){this._bb.one(r.SENDMSGDIALOG.NOTICE).setHTML(e),this._bb.one(r.SENDMSGDIALOG.NOTICEAREA).show()},setSendLock:function(e){e?this._sendLock=!0:this._sendLock=!1},_setEvents:function(){this._bb.one(r.SENDMSGDIALOG.FORM).on("submit",function(e){var t=this._bb.one(r.SENDMSGDIALOG.INPUT).get("value");e.preventDefault(),this.sendMessage(t)},this)},_validateMessage:function(e){var t;return e?(t=e.replace(" ","").replace("&nbsp;","").replace(/(<br\s*\/?>(<\/br\s*\/?>)?)+/,"").trim(),t.length>1):!1}},{NAME:"core_message-messenger-sendmessage",CSS_PREFIX:n.SENDMSGDIALOG.PREFIX,ATTRS:{fullname:{validator:e.Lang.isString,value:""},url:{validator:e.Lang.isString,value:null},userid:{validator:e.Lang.isNumber,value:0}}}),e.Base.modifyAttrs(e.namespace("M.core_message.messenger.sendMessage"),{extraClasses:{value:["core_message-messenger-sendmessage"]},focusOnPreviousTargetAfterHide:{value:!0},width:{value:"360px"},visible:{value:!1},modal:{value:!0},draggable:{value:!1},center:{value:!0}})},"@VERSION@",{requires:["escape","handlebars","io-base","moodle-core-notification-ajaxexception","moodle-core-notification-alert","moodle-core-notification-dialogue","moodle-core-notification-exception"]});
diff --git a/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger.js b/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger.js
index 20c85f10287..1c604a86d5e 100644
--- a/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger.js
+++ b/message/yui/build/moodle-core_message-messenger/moodle-core_message-messenger.js
@@ -351,19 +351,18 @@ Y.namespace('M.core_message.messenger').sendMessage = Y.extend(SENDMSGDIALOG, M.
 
                     // Hide the dialog.
                     Y.later(1300, this, function() {
+                        this.setSendLock(false);
                         this.hideNotice();
                         this.hide();
                     });
                 },
                 failure: function() {
+                    this.setSendLock(false);
                     this.hideNotice();
                     new M.core.alert({
                         title: M.util.get_string('error', 'core'),
                         message: M.util.get_string('errorwhilesendingmessage', 'core_message')
                     });
-                },
-                complete: function() {
-                    this.setSendLock(false);
                 }
             },
             context: this
diff --git a/message/yui/src/messenger/js/sendmessage.js b/message/yui/src/messenger/js/sendmessage.js
index db3a497f53e..51d81eb73c5 100644
--- a/message/yui/src/messenger/js/sendmessage.js
+++ b/message/yui/src/messenger/js/sendmessage.js
@@ -186,19 +186,18 @@ Y.namespace('M.core_message.messenger').sendMessage = Y.extend(SENDMSGDIALOG, M.
 
                     // Hide the dialog.
                     Y.later(1300, this, function() {
+                        this.setSendLock(false);
                         this.hideNotice();
                         this.hide();
                     });
                 },
                 failure: function() {
+                    this.setSendLock(false);
                     this.hideNotice();
                     new M.core.alert({
                         title: M.util.get_string('error', 'core'),
                         message: M.util.get_string('errorwhilesendingmessage', 'core_message')
                     });
-                },
-                complete: function() {
-                    this.setSendLock(false);
                 }
             },
             context: this