Merge branch 'MDL-64703-master' of git://github.com/bmbrands/moodle

diff --cc message/amd/src/message_drawer_view_overview_section.js
index 01dba3e,cb60ee0..6409566
--- 1/message/amd/src/message_drawer_view_overview_section.js
--- 2/message/amd/src/message_drawer_view_overview_section.js
+++ b/message/amd/src/message_drawer_view_overview_section.js
@@@ -658,8 -659,10 +659,10 @@@ function
       * @param {bool} includeFavourites If this section includes favourites
       * @param {Object} totalCountPromise Resolves wth the total conversations count
       * @param {Object} unreadCountPromise Resolves wth the unread conversations count
 -     * @param {bool} overview shown in message app panel.
++     * @param {bool} fromPanel shown in message app panel.
       */
-     var show = function(namespace, header, body, footer, type, includeFavourites, totalCountPromise, unreadCountPromise) {
+     var show = function(namespace, header, body, footer, type, includeFavourites, totalCountPromise, unreadCountPromise,
+         fromPanel) {
          var root = $(body);
  
          if (!root.attr('data-init')) {

diff --cc message/classes/helper.php
Simple merge

diff --cc theme/boost/style/moodle.css
Simple merge

diff --cc theme/classic/style/moodle.css
Simple merge