From af3cfc7729c14f7d673990ae26394e4d1961bc67 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 09:29:16 +0800
Subject: [PATCH 01/18] MDL-64099 message: bold senders name in message

---
 .../message_drawer_view_conversation_body_message.mustache      | 2 +-
 .../message_drawer_view_conversation_body_message.mustache      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_body_message.mustache b/message/templates/message_drawer_view_conversation_body_message.mustache
index c6ef486f42f..4ee950bfcc9 100644
--- a/message/templates/message_drawer_view_conversation_body_message.mustache
+++ b/message/templates/message_drawer_view_conversation_body_message.mustache
@@ -54,7 +54,7 @@
             >
         </div>
         <div class="pl-2 pr-2">
-            <h6 class="text-truncate m-0">{{userfrom.fullname}}</h6>
+            <h6 class="text-truncate m-0 font-weight-bold">{{userfrom.fullname}}</h6>
         </div>
         {{/fromloggedinuser}}
         <div
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
index abaff69874f..24b08941f07 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
@@ -58,7 +58,7 @@
             >
         </div>
         <div class="pl-2 pr-2">
-            <h6 class="text-truncate m-0">{{userfrom.fullname}}</h6>
+            <h6 class="text-truncate m-0"><strong>{{userfrom.fullname}}</strong></h6>
         </div>
         {{/fromloggedinuser}}
         <div

From a47160745756e1df9f3b923110be3e8ccaa539eb Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 10:01:38 +0800
Subject: [PATCH 02/18] MDL-64099 message: increase margins between messages in
 conversations

---
 .../message_drawer_view_conversation_body_message.mustache      | 2 +-
 .../message_drawer_view_conversation_body_messages.mustache     | 2 +-
 .../message_drawer_view_conversation_body_message.mustache      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_body_message.mustache b/message/templates/message_drawer_view_conversation_body_message.mustache
index 4ee950bfcc9..668fb8b079d 100644
--- a/message/templates/message_drawer_view_conversation_body_message.mustache
+++ b/message/templates/message_drawer_view_conversation_body_message.mustache
@@ -35,7 +35,7 @@
 
 }}
 <div
-    class="message clickable d-flex flex-column p-2 {{#fromloggedinuser}}bg-secondary{{/fromloggedinuser}}{{^fromloggedinuser}}bg-white{{/fromloggedinuser}} rounded mb-2"
+    class="message clickable d-flex flex-column p-2 {{#fromloggedinuser}}bg-secondary{{/fromloggedinuser}}{{^fromloggedinuser}}bg-white{{/fromloggedinuser}} rounded mb-2 mt-2"
     data-region="message"
     data-message-id="{{id}}"
     role="checkbox"
diff --git a/message/templates/message_drawer_view_conversation_body_messages.mustache b/message/templates/message_drawer_view_conversation_body_messages.mustache
index b87ecd80358..7d234cbc5a0 100644
--- a/message/templates/message_drawer_view_conversation_body_messages.mustache
+++ b/message/templates/message_drawer_view_conversation_body_messages.mustache
@@ -34,7 +34,7 @@
     {}
 
 }}
-<div data-region="day-messages-container">
+<div class="d-flex flex-column" data-region="day-messages-container">
     {{#messages}}
         {{> core_message/message_drawer_view_conversation_body_message }}
     {{/messages}}
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
index 24b08941f07..f03cdcd1fc5 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
@@ -39,7 +39,7 @@
 }}
 
 <div
-    class="message clickable d-flex flex-column p-2 {{#fromloggedinuser}}bg-secondary{{/fromloggedinuser}}{{^fromloggedinuser}}bg-white{{/fromloggedinuser}} rounded mb-2"
+    class="message clickable d-flex flex-column p-2 {{#fromloggedinuser}}bg-secondary{{/fromloggedinuser}}{{^fromloggedinuser}}bg-white{{/fromloggedinuser}} rounded mb-2 mt-2"
     data-region="message"
     data-message-id="{{id}}"
     aria-checked="false"

From a009ce6014bc33b756e1901054aad928e0b07033 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 10:02:23 +0800
Subject: [PATCH 03/18] MDL-64099 message: de-emphasize participant count in
 group conversation

---
 ...awer_view_conversation_header_content_type_public.mustache | 4 ++--
 ...awer_view_conversation_header_content_type_public.mustache | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
index 07950f88ce7..493e05d5729 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
@@ -62,9 +62,9 @@
                     </span>
                 </div>
                 <p class="m-0 text-truncate">{{subname}}</p>
-                <p class="m-0 font-weight-light text-truncate">
+                <small class="m-0 text-muted text-truncate">
                     {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
-                </p>
+                </small>
             </div>
         </a>
     </div>
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index 42071fc2ecd..ff59e716ecb 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -66,9 +66,9 @@
                     </span>
                 </div>
                 <p class="m-0 text-truncate">{{subname}}</p>
-                <p class="m-0 font-weight-light text-truncate">
+                <small class="m-0 muted text-truncate">
                     {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
-                </p>
+                </small>
             </div>
         </a>
     </div>

From c483a8eee7744565822944974cd339a2ca081d64 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 10:17:46 +0800
Subject: [PATCH 04/18] MDL-64099 message: remove conversation name link
 underline

---
 ...wer_view_conversation_header_content_type_private.mustache | 2 +-
 ...awer_view_conversation_header_content_type_public.mustache | 2 +-
 theme/boost/scss/moodle/core.scss                             | 4 ++++
 theme/boost/style/moodle.css                                  | 4 ++++
 theme/bootstrapbase/less/moodle/core.less                     | 4 ++++
 theme/bootstrapbase/style/moodle.css                          | 4 ++++
 ...wer_view_conversation_header_content_type_private.mustache | 2 +-
 ...awer_view_conversation_header_content_type_public.mustache | 2 +-
 8 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
index 5d614f95cf1..df7b4db61fe 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_private.mustache
@@ -42,7 +42,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-contact">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
index 493e05d5729..e1de620aa65 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
@@ -42,7 +42,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-group-info">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 80ef7d52908..6b887668ed9 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2245,3 +2245,7 @@ $switch-transition: .2s all !default;
 .paged-content-page-container {
     min-height: 3.125rem;
 }
+
+.text-decoration-none {
+    text-decoration: none !important; /* stylelint-disable-line declaration-no-important */
+}
\ No newline at end of file
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 8296af2cfcf..37dfb4c635c 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10528,6 +10528,10 @@ div.editor_atto_toolbar button .icon {
 .paged-content-page-container {
   min-height: 3.125rem; }
 
+.text-decoration-none {
+  text-decoration: none !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
 .icon {
   font-size: 16px;
   width: 16px;
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index 251435cb49d..d4a8acbadbe 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -2442,4 +2442,8 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
     100% {
         background-color: @grayLighter;
     }
+}
+
+.text-decoration-none {
+    text-decoration: none !important; /* stylelint-disable-line declaration-no-important */
 }
\ No newline at end of file
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 243577276cb..29f47c27289 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -4823,6 +4823,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
     background-color: #eee;
   }
 }
+.text-decoration-none {
+  text-decoration: none !important;
+  /* stylelint-disable-line declaration-no-important */
+}
 /* admin.less */
 .formtable tbody th {
   font-weight: normal;
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
index ae6f25b68ff..6b341d82010 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_private.mustache
@@ -47,7 +47,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-contact">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-contact">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index ff59e716ecb..c13a184fc7d 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -46,7 +46,7 @@
         </a>
     </div>
     <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate" href="#" data-action="view-group-info">
+        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
             {{#imageurl}}
                 <div class="d-flex align-items-center">
                     <img

From 2809ab7b52ab2a14e803db4fee8f116c65624a65 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 11:29:58 +0800
Subject: [PATCH 05/18] MDL-64099 message: Align the icons and avatar at the
 top of the header

---
 ...e_drawer_view_conversation_header.mustache |   2 +-
 ...sation_header_content_type_public.mustache | 102 +++++++++-------
 ...sation_header_content_type_public.mustache | 114 ++++++++++--------
 3 files changed, 119 insertions(+), 99 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_header.mustache b/message/templates/message_drawer_view_conversation_header.mustache
index 64d2039c04d..66f84bff712 100644
--- a/message/templates/message_drawer_view_conversation_header.mustache
+++ b/message/templates/message_drawer_view_conversation_header.mustache
@@ -35,7 +35,7 @@
 }}
 
 <div
-    class="hidden bg-white position-relative border-bottom px-2 py-3"
+    class="hidden bg-white position-relative border-bottom px-2 py-2"
     aria-hidden="true"
     data-region="view-conversation"
 >
diff --git a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
index e1de620aa65..233497b3557 100644
--- a/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/message/templates/message_drawer_view_conversation_header_content_type_public.mustache
@@ -35,53 +35,63 @@
 
 }}
 
-<div class="d-flex align-items-center">
-    <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
-            {{> core_message/message_drawer_icon_back }}
-        </a>
-    </div>
-    <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
-            {{#imageurl}}
-                <div class="d-flex align-items-center">
-                    <img
-                        class="rounded-circle"
-                        src="{{{.}}}"
-                        alt="{{name}}"
-                        aria-hidden="true"
-                        style="height: 38px"
-                    >
-                </div>
-            {{/imageurl}}
-            <div class="w-100 text-truncate ml-2">
-                <div class="d-flex">
-                    <strong class="m-0 text-truncate">{{name}}</strong>
-                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
-                        {{#pix}} i/star-rating, core {{/pix}}
-                    </span>
-                </div>
-                <p class="m-0 text-truncate">{{subname}}</p>
-                <small class="m-0 text-muted text-truncate">
-                    {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
-                </small>
-            </div>
-        </a>
-    </div>
-    <div class="ml-auto dropdown">
-        <button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            {{#pix}} i/moremenu, core {{/pix}}
-        </button>
-        <div class="dropdown-menu pull-right">
-            <a class="dropdown-item" href="#" data-action="view-group-info">
-                {{#str}} groupinfo, core_message {{/str}}
-            </a>
-            <a class="dropdown-item {{#isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" href="#" data-action="confirm-favourite">
-                {{#str}} addtofavourites, core_message {{/str}}
-            </a>
-            <a class="dropdown-item {{^isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" href="#" data-action="confirm-unfavourite">
-                {{#str}} removefromfavourites, core_message {{/str}}
+<div class="d-flex flex-column">
+    <div class="d-flex align-items-center">
+        <div class="align-self-stretch" >
+            <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+                {{> core_message/message_drawer_icon_back }}
             </a>
         </div>
+        <div class="d-flex text-truncate">
+            <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
+                {{#imageurl}}
+                    <div class="d-flex align-items-center">
+                        <img
+                            class="rounded-circle"
+                            src="{{{.}}}"
+                            alt="{{name}}"
+                            aria-hidden="true"
+                            style="height: 38px"
+                        >
+                    </div>
+                {{/imageurl}}
+                <div class="w-100 text-truncate ml-2">
+                    <div class="d-flex">
+                        <strong class="m-0 text-truncate">{{name}}</strong>
+                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                            {{#pix}} i/star-rating, core {{/pix}}
+                        </span>
+                    </div>
+                    <p class="m-0 text-truncate">{{subname}}</p>
+                </div>
+            </a>
+        </div>
+        <div class="ml-auto dropdown">
+            <button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                {{#pix}} i/moremenu, core {{/pix}}
+            </button>
+            <div class="dropdown-menu pull-right">
+                <a class="dropdown-item" href="#" data-action="view-group-info">
+                    {{#str}} groupinfo, core_message {{/str}}
+                </a>
+                <a class="dropdown-item {{#isfavourite}}hidden{{/isfavourite}}" href="#" data-action="confirm-favourite">
+                    {{#str}} addtofavourites, core_message {{/str}}
+                </a>
+                <a class="dropdown-item {{^isfavourite}}hidden{{/isfavourite}}" href="#" data-action="confirm-unfavourite">
+                    {{#str}} removefromfavourites, core_message {{/str}}
+                </a>
+            </div>
+        </div>
+    </div>
+    <div class="d-flex">
+        <!-- These are just placeholder elements to align the text below correctly with the name text above -->
+        <div class="mr-2 icon" aria-hidden="true"></div>
+        {{#imageurl}}<div style="width: 38px" aria-hidden="true"></div>{{/imageurl}}
+        <!-- End placeholders -->
+        <a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info">
+            <small class="m-0 text-muted text-truncate">
+                {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
+            </small>
+        </a>
     </div>
 </div>
\ No newline at end of file
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index c13a184fc7d..8d1263f8289 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -39,59 +39,69 @@
 
 }}
 
-<div class="d-flex align-items-center">
-    <div class="align-self-stretch" >
-        <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
-            {{> core_message/message_drawer_icon_back }}
-        </a>
-    </div>
-    <div class="d-flex text-truncate">
-        <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
-            {{#imageurl}}
-                <div class="d-flex align-items-center">
-                    <img
-                        class="rounded-circle"
-                        src="{{{.}}}"
-                        alt="{{name}}"
-                        aria-hidden="true"
-                        style="height: 38px"
-                    >
+<div class="d-flex flex-column">
+    <div class="d-flex align-items-center">
+        <div class="align-self-stretch" >
+            <a class="h-100 mr-2 d-flex align-items-center" href="#" data-route-back>
+                {{> core_message/message_drawer_icon_back }}
+            </a>
+        </div>
+        <div class="d-flex text-truncate">
+            <a class="d-flex text-truncate text-decoration-none" href="#" data-action="view-group-info">
+                {{#imageurl}}
+                    <div class="d-flex align-items-center">
+                        <img
+                            class="rounded-circle"
+                            src="{{{.}}}"
+                            alt="{{name}}"
+                            aria-hidden="true"
+                            style="height: 38px"
+                        >
+                    </div>
+                {{/imageurl}}
+                <div class="w-100 text-truncate ml-2">
+                    <div class="d-flex">
+                        <strong class="m-0 text-truncate">{{name}}</strong>
+                        <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
+                            {{#pix}} i/star, core {{/pix}}
+                        </span>
+                    </div>
+                    <p class="m-0 text-truncate">{{subname}}</p>
                 </div>
-            {{/imageurl}}
-            <div class="w-100 text-truncate ml-2">
-                <div class="d-flex">
-                    <strong class="m-0 text-truncate">{{name}}</strong>
-                    <span class="{{^isfavourite}}hidden{{/isfavourite}} ml-1 text-primary" data-region="favourite-icon-container">
-                        {{#pix}} i/star, core {{/pix}}
-                    </span>
-                </div>
-                <p class="m-0 text-truncate">{{subname}}</p>
-                <small class="m-0 muted text-truncate">
-                    {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
-                </small>
+            </a>
+        </div>
+        <div class="ml-auto dropdown">
+            <button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                {{#pix}} i/moremenu, core {{/pix}}
+            </button>
+            <div class="dropdown-menu pull-right">
+                <li data-action="view-group-info">
+                    <a class="dropdown-item" href="#">
+                        {{#str}} groupinfo, core_message {{/str}}
+                    </a>
+                </li>
+                <li class="{{#isfavourite}}hidden{{/isfavourite}}" data-action="confirm-favourite">
+                    <a class="dropdown-item" href="#">
+                        {{#str}} addtofavourites, core_message {{/str}}
+                    </a>
+                </li>
+                <li class="{{^isfavourite}}hidden{{/isfavourite}}" data-action="confirm-unfavourite">
+                    <a class="dropdown-item" href="#">
+                        {{#str}} removefromfavourites, core_message {{/str}}
+                    </a>
+                </li>
             </div>
-        </a>
-    </div>
-    <div class="ml-auto dropdown">
-        <button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            {{#pix}} i/moremenu, core {{/pix}}
-        </button>
-        <div class="dropdown-menu pull-right">
-            <li data-action="view-group-info">
-                <a class="dropdown-item" href="#">
-                    {{#str}} groupinfo, core_message {{/str}}
-                </a>
-            </li>
-            <li class="{{#isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" data-action="confirm-favourite">
-                <a class="dropdown-item" href="#">
-                    {{#str}} addtofavourites, core_message {{/str}}
-                </a>
-            </li>
-            <li class="{{^isfavourite}}hidden{{/isfavourite}} {{^showfavourite}}hidden{{/showfavourite}}" data-action="confirm-unfavourite">
-                <a class="dropdown-item" href="#">
-                    {{#str}} removefromfavourites, core_message {{/str}}
-                </a>
-            </li>
         </div>
     </div>
-</div>
\ No newline at end of file
+    <div class="d-flex">
+        <!-- These are just placeholder elements to align the text below correctly with the name text above -->
+        <div class="mr-2" style="opacity: 0; visibility: hidden" aria-hidden="true">{{> core_message/message_drawer_icon_back }}</div>
+        {{#imageurl}}<div aria-hidden="true" style="width: 38px"></div>{{/imageurl}}
+        <!-- End placeholders -->
+        <a class="text-decoration-none line-height-3 ml-2" href="#" data-action="view-group-info">
+            <small class="m-0 muted text-truncate">
+                {{#str}} numparticipants, core_message, {{totalmembercount}} {{/str}}
+            </small>
+        </a>
+    </div>
+</div>

From 41cc9fbb57fb0c10789dca61c61b7be52b0fed9b Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 12:04:20 +0800
Subject: [PATCH 06/18] MDL-64099 message: move delete messages icon to the
 right

---
 ...message_drawer_view_conversation_footer_edit_mode.mustache | 2 +-
 ...message_drawer_view_conversation_footer_edit_mode.mustache | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache b/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
index c1f2bdea6b2..f1c9127a275 100644
--- a/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
+++ b/message/templates/message_drawer_view_conversation_footer_edit_mode.mustache
@@ -35,7 +35,7 @@
 
 }}
 
-<div class="d-flex p-3">
+<div class="d-flex p-3 justify-content-end">
     <button
         class="btn btn-link btn-icon my-1 icon-size-4"
         data-action="delete-selected-messages"
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache
index bae82eed2d5..d8568f47231 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_footer_edit_mode.mustache
@@ -40,7 +40,7 @@
 
 <div class="d-flex p-3">
     <button
-        class="btn btn-link btn-icon my-1 icon-size-4"
+        class="btn btn-link btn-icon my-1 icon-size-4 ml-auto"
         data-action="delete-selected-messages"
         data-toggle="tooltip"
         data-placement="top"
@@ -50,4 +50,4 @@
         <span class="hidden" data-region="loading-icon-container">{{> core/loading }}</span>
         <span class="sr-only">{{#str}} deleteselectedmessages, core_message {{/str}}</span>
     </button>
-</div>
\ No newline at end of file
+</div>

From 302586a5bc463d707309a39844ca413c8dd62634 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Wed, 21 Nov 2018 14:53:24 +0800
Subject: [PATCH 07/18] MDL-64099 message: Change icons for select and selected
 messages

---
 lib/classes/output/icon_system_fontawesome.php    |   2 ++
 ...drawer_view_conversation_body_message.mustache |   4 ++--
 pix/i/checkedcircle.png                           | Bin 0 -> 327 bytes
 pix/i/checkedcircle.svg                           |   1 +
 pix/i/uncheckedcircle.png                         | Bin 0 -> 340 bytes
 pix/i/uncheckedcircle.svg                         |   1 +
 ...drawer_view_conversation_body_message.mustache |   4 ++--
 7 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 pix/i/checkedcircle.png
 create mode 100644 pix/i/checkedcircle.svg
 create mode 100644 pix/i/uncheckedcircle.png
 create mode 100644 pix/i/uncheckedcircle.svg

diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index a40689ccdc4..1530895f952 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -200,6 +200,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:i/calendareventtime' => 'fa-clock-o',
             'core:i/caution' => 'fa-exclamation text-warning',
             'core:i/checked' => 'fa-check',
+            'core:i/checkedcircle' => 'fa-check-circle',
             'core:i/checkpermissions' => 'fa-unlock-alt',
             'core:i/cohort' => 'fa-users',
             'core:i/competencies' => 'fa-check-square-o',
@@ -306,6 +307,7 @@ class icon_system_fontawesome extends icon_system_font {
             'core:i/trash' => 'fa-trash',
             'core:i/twoway' => 'fa-arrows-h',
             'core:i/unchecked' => 'fa-square-o',
+            'core:i/uncheckedcircle' => 'fa-circle-o',
             'core:i/unflagged' => 'fa-flag-o',
             'core:i/unlock' => 'fa-unlock',
             'core:i/up' => 'fa-arrow-up',
diff --git a/message/templates/message_drawer_view_conversation_body_message.mustache b/message/templates/message_drawer_view_conversation_body_message.mustache
index 668fb8b079d..1c41d2629c1 100644
--- a/message/templates/message_drawer_view_conversation_body_message.mustache
+++ b/message/templates/message_drawer_view_conversation_body_message.mustache
@@ -63,8 +63,8 @@
         >
             {{formattedtime}}
         </div>
-        <span class="hidden ml-2 small text-primary" data-region="not-selected-icon">{{#pix}} i/unchecked, core {{/pix}}</span>
-        <span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checked, core {{/pix}}</span>
+        <span class="hidden ml-2 small text-dark" data-region="not-selected-icon">{{#pix}} i/uncheckedcircle, core {{/pix}}</span>
+        <span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checkedcircle, core {{/pix}}</span>
     </div>
     <div>{{{text}}}</div>
 </div>
\ No newline at end of file
diff --git a/pix/i/checkedcircle.png b/pix/i/checkedcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..5501a0237d7eac83714dd55583a8d2cfb5f3cfdd
GIT binary patch
literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy|`AI}UR5;6}lfiMqFc3wbl>&fU#uw-ScK{_&f_&N3q`ia^T!JaU
zGq?lj04i_}S!HC$Xkhp!&1&CD`r0jqVIY;NdcXra#ySB<5jm#8A{J294bT8v^6G(u
zh+O^(7<>j6Jf}NQiO9uSpm_ntavOk;vMfFD#q0X)y6)=CuxHc*E1*td-p#mueE{!8
z<YrfoIXgE=tbxjaf3T`9ffiWDO*c8Yu~YU2&cUN^P7ADoR#lftkt_^Qgb><^59xc!
z!N92qA$Z_>&NN%MneMD(C!S}LqLGi_UPP+s!NJ-y)iwj)jrldv24nhtxrVAn!}QKL
Z{{X~eZ$;Fu`;Pzs002ovPDHLkV1oA5j1B+*

literal 0
HcmV?d00001

diff --git a/pix/i/checkedcircle.svg b/pix/i/checkedcircle.svg
new file mode 100644
index 00000000000..60aa48aef17
--- /dev/null
+++ b/pix/i/checkedcircle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>selected</title><path d="M8,16a8,8,0,1,1,8-8A8,8,0,0,1,8,16ZM13.19,5.83l-.95-.94a.65.65,0,0,0-.94,0L7.05,9.14,4.7,6.78a.65.65,0,0,0-.94,0l-.95.94a.68.68,0,0,0-.19.48.65.65,0,0,0,.19.47l3.77,3.77a.67.67,0,0,0,.95,0l5.66-5.66a.65.65,0,0,0,.19-.47A.68.68,0,0,0,13.19,5.83Z" fill="#999"/></svg>
\ No newline at end of file
diff --git a/pix/i/uncheckedcircle.png b/pix/i/uncheckedcircle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3966279951d65ab2be8d6a2e7f10e06723974e7d
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XT
z000XT0n*)m`~Uy}21!IgR5;6}ld)~XFc3wb==4dgN*jcL2Czq9=T>emtu{!!foe9=
z2pYi}fB?OLvOzq7(i{UtfFnD8C3*joJpRk3X=0A|z5*&>%Wnpt6OnGdm?Z=6eF5~q
zD{ui$K-9VdaKJNg2AqhDKL#p}T5tp!5&2r&>;<TScRj$0$oQoDy^0UZD<;(N!+Sph
zt!nHh&+`g+1CAonutHguF@%r-`w+sX(S}`sRq>2QHI>nB_sci`h1Q;ct<klS`-uRC
z2T2C@AKD@r48TtR`6jg10fPZL%|Ly}>9uOQl*FhJz8a*(thB&cL~Kf;)2_A}>szAi
m)`qE{eXj*}SBL45asCEN(0K%9BWT6|0000<MNUMnLSTZ;K9AD?

literal 0
HcmV?d00001

diff --git a/pix/i/uncheckedcircle.svg b/pix/i/uncheckedcircle.svg
new file mode 100644
index 00000000000..d66f099abf7
--- /dev/null
+++ b/pix/i/uncheckedcircle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>select 2</title><path d="M8,16A8,8,0,0,1,8,0H8A8,8,0,0,1,8,16ZM1.33,8A6.67,6.67,0,1,0,8,1.33,6.67,6.67,0,0,0,1.33,8Z" fill="#999"/></svg>
\ No newline at end of file
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
index f03cdcd1fc5..055d6d0fc64 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
@@ -67,8 +67,8 @@
         >
             {{formattedtime}}
         </div>
-        <span class="hidden ml-2 small text-primary" data-region="not-selected-icon">{{#pix}} i/completion-manual-n, core {{/pix}}</span>
-        <span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checked, core {{/pix}}</span>
+        <span class="hidden ml-2 small text-primary" data-region="not-selected-icon">{{#pix}} i/uncheckedcircle, core {{/pix}}</span>
+        <span class="hidden ml-2 small text-primary" data-region="selected-icon">{{#pix}} i/checkedcircle, core {{/pix}}</span>
     </div>
     <div>{{{text}}}</div>
 </div>

From 71b13a84a44df2c7fb8fa0c892f6695211a7646e Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 12:09:42 +0100
Subject: [PATCH 08/18] MDL-64099 message: Add sender name to conversation
 preview in overview

---
 .../message_drawer_view_overview_section.min.js     |  2 +-
 .../amd/src/message_drawer_view_overview_section.js | 13 +++++++++++++
 .../message_drawer_conversations_list.mustache      |  3 ++-
 theme/bootstrapbase/less/moodle/bs4-compat.less     |  4 +++-
 theme/bootstrapbase/style/moodle.css                |  3 +++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/message/amd/build/message_drawer_view_overview_section.min.js b/message/amd/build/message_drawer_view_overview_section.min.js
index 779e7d6e8d3..be8d047a26b 100644
--- a/message/amd/build/message_drawer_view_overview_section.min.js
+++ b/message/amd/build/message_drawer_view_overview_section.min.js
@@ -1 +1 @@
-define(["jquery","core/custom_interaction_events","core/notification","core/pubsub","core/str","core/templates","core/user_date","core_message/message_repository","core_message/message_drawer_events","core_message/message_drawer_router","core_message/message_drawer_routes","core_message/message_drawer_lazy_load_list","core_message/message_drawer_view_conversation_constants"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n={TOGGLE:'[data-region="toggle"]',CONVERSATION:"[data-conversation-id]",BLOCKED_ICON_CONTAINER:'[data-region="contact-icon-blocked"]',LAST_MESSAGE:'[data-region="last-message"]',LAST_MESSAGE_DATE:'[data-region="last-message-date"]',UNREAD_COUNT:'[data-region="unread-count"]',SECTION_TOTAL_COUNT:'[data-region="section-total-count"]',SECTION_TOTAL_COUNT_CONTAINER:'[data-region="section-total-count-container"]',SECTION_UNREAD_COUNT:'[data-region="section-unread-count"]',PLACEHOLDER_CONTAINER:'[data-region="placeholder-container"]'},o={CONVERSATIONS_LIST:"core_message/message_drawer_conversations_list",CONVERSATIONS_LIST_ITEMS_PLACEHOLDER:"core_message/message_drawer_conversations_list_items_placeholder"},p=50,q={},r=!1,s=!1,t=function(a){return l.getRoot(a).hasClass("show")},u=function(a){a.addClass("expanded")},v=function(a){a.removeClass("expanded")},w=function(a,b){var c=a.find(n.SECTION_TOTAL_COUNT_CONTAINER),d=c.find(n.SECTION_TOTAL_COUNT);d.text(b),c.removeClass("hidden");var e=b>20?20:b,g=Array.apply(null,Array(e)).map(function(){return!0});f.render(o.CONVERSATIONS_LIST_ITEMS_PLACEHOLDER,{placeholders:g}).then(function(b){var c=a.find(n.PLACEHOLDER_CONTAINER);c.html(b)})["catch"](function(){})},x=function(a,b){var c=a.find(n.SECTION_UNREAD_COUNT);c.text(b),b>0&&c.removeClass("hidden")},y=function(b,d,e){var g=d.map(function(b){var c=b.messages.length?b.messages[b.messages.length-1]:null,d={id:b.id,imageurl:b.imageurl,name:b.name,subname:b.subname,unreadcount:b.unreadcount,lastmessagedate:c?c.timecreated:null,sentfromcurrentuser:c?c.useridfrom==e:null,lastmessage:c?a(c.text).text()||c.text:null};if(b.type==m.CONVERSATION_TYPES.PRIVATE){var f=b.members.reduce(function(a,b){return a||b.id==e||(a=b),a},null);d.userid=f.id,d.showonlinestatus=f.showonlinestatus,d.isonline=f.isonline,d.isblocked=f.isblocked}return d});return f.render(o.CONVERSATIONS_LIST,{conversations:g}).then(function(a){return b.append(a),a})["catch"](c.exception)},z=function(a,b,d){return function(e,f){return h.getConversations(f,a,p+1,d,b).then(function(a){var b=a.conversations;return b.length>p?b=b.slice(0,-1):l.setLoadedAll(e,!0),d+=p,b.forEach(function(a){q[a.id]=a}),b})["catch"](c.exception)}},A=function(a){return a.find(n.SECTION_TOTAL_COUNT)},B=function(a){return a.find(n.SECTION_UNREAD_COUNT)},C=function(a){if(r){var b=A(a),c=parseInt(b.text());c+=1,b.text(c)}},D=function(a){if(r){var b=A(a),c=parseInt(b.text());c-=1,b.text(c)}},E=function(a){if(s){var b=B(a),c=parseInt(b.text());c-=1,b.text(c),c<1&&b.addClass("hidden")}},F=function(a,b){return a.find('[data-conversation-id="'+b+'"]')},G=function(a,b){return a.find('[data-user-id="'+b+'"]')},H=function(a){a.find(n.BLOCKED_ICON_CONTAINER).removeClass("hidden")},I=function(a){a.find(n.BLOCKED_ICON_CONTAINER).addClass("hidden")},J=function(b,c){var d=c.messages[c.messages.length-1],f="",h=[{key:"you",component:"core_message"},{key:"strftimetime24",component:"core_langconfig"}];return e.get_strings(h).then(function(a){return f=a[0],g.get([{timestamp:d.timeCreated,format:a[1]}])}).then(function(a){return a[0]}).then(function(c){var e=a(d.text).text();return d.fromLoggedInUser&&(e=f+" "+e),b.find(n.LAST_MESSAGE).html(e),b.find(n.LAST_MESSAGE_DATE).text(c).removeClass("hidden"),c})},K=function(b,d){var e=b.find(n.CONVERSATION),g="";if(!e.length){var h=l.getRoot(b);l.showContent(h),l.hideEmptyMessage(h)}var i=d.messages.length,j=i?d.messages[i-1]:null;j&&(g=a(j.text).text()||j.text);var k={id:d.id,name:d.name,subname:d.subname,lastmessagedate:j?j.timeCreated:null,sentfromcurrentuser:j?j.fromLoggedInUser:null,lastmessage:g,imageurl:d.imageUrl};return q[d.id]=d,f.render(o.CONVERSATIONS_LIST,{conversations:[k]}).then(function(a){var c=l.getContentContainer(b);return c.prepend(a)}).then(function(){return C(b)})["catch"](c.exception)},L=function(a,b){b.remove(),D(a);var c=a.find(n.CONVERSATION);if(!c.length){var d=l.getRoot(a);l.hideContent(d),l.showEmptyMessage(d)}},M=function(a,b){var c=b.find(n.UNREAD_COUNT);c.text("0"),c.addClass("hidden"),E(a)},N=function(c,e,f,g){var h=l.getRoot(c),m=c.find(n.TOGGLE);c.css("min-height",m.outerHeight()),c.on("show.bs.collapse",function(){u(c),l.show(h,e,y)}),c.on("hidden.bs.collapse",function(){v(c)}),d.subscribe(i.CONTACT_BLOCKED,function(a){var b=G(c,a);b.length&&H(b)}),d.subscribe(i.CONTACT_UNBLOCKED,function(a){var b=G(c,a);b.length&&I(b)}),d.subscribe(i.CONVERSATION_NEW_LAST_MESSAGE,function(a){if(!(f&&a.type!=f||g&&!a.isFavourite||!g&&a.isFavourite)){var b=a.id,d=F(c,b);d.length?J(d,a):K(c,a)}}),d.subscribe(i.CONVERSATION_DELETED,function(a){var b=F(c,a);b.length&&L(c,b)}),d.subscribe(i.CONVERSATION_READ,function(a){var b=F(c,a);b.length&&M(c,b)}),d.subscribe(i.CONVERSATION_SET_FAVOURITE,function(a){var b=null;!g||f&&f!=a.type?f==a.type&&(b=F(c,a.id),b.length&&L(c,b)):(b=F(c,a.id),b.length||K(c,a))}),d.subscribe(i.CONVERSATION_UNSET_FAVOURITE,function(a){var b=null;g?(b=F(c,a.id),b.length&&L(c,b)):f==a.type&&(b=F(c,a.id),b.length||K(c,a))}),b.define(c,[b.events.activate]),c.on(b.events.activate,n.CONVERSATION,function(b,c){var d=a(b.target).closest(n.CONVERSATION),e=d.attr("data-conversation-id"),f=q[e];j.go(k.VIEW_CONVERSATION,f),c.originalEvent.preventDefault()})},O=function(b,c,d,e,f){if(b=a(b),!b.attr("data-init")){var g=z(c,d,0);if(N(b,g,c,d),t(b)){u(b);var h=l.getRoot(b);l.show(h,g,y)}e.then(function(a){w(b,a),r=!0})["catch"](function(){}),f.then(function(a){x(b,a),r=!0})["catch"](function(){}),b.attr("data-init",!0)}};return{show:O,isVisible:t}});
\ No newline at end of file
+define(["jquery","core/custom_interaction_events","core/notification","core/pubsub","core/str","core/templates","core/user_date","core_message/message_repository","core_message/message_drawer_events","core_message/message_drawer_router","core_message/message_drawer_routes","core_message/message_drawer_lazy_load_list","core_message/message_drawer_view_conversation_constants"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n={TOGGLE:'[data-region="toggle"]',CONVERSATION:"[data-conversation-id]",BLOCKED_ICON_CONTAINER:'[data-region="contact-icon-blocked"]',LAST_MESSAGE:'[data-region="last-message"]',LAST_MESSAGE_DATE:'[data-region="last-message-date"]',UNREAD_COUNT:'[data-region="unread-count"]',SECTION_TOTAL_COUNT:'[data-region="section-total-count"]',SECTION_TOTAL_COUNT_CONTAINER:'[data-region="section-total-count-container"]',SECTION_UNREAD_COUNT:'[data-region="section-unread-count"]',PLACEHOLDER_CONTAINER:'[data-region="placeholder-container"]'},o={CONVERSATIONS_LIST:"core_message/message_drawer_conversations_list",CONVERSATIONS_LIST_ITEMS_PLACEHOLDER:"core_message/message_drawer_conversations_list_items_placeholder"},p=50,q={},r=!1,s=!1,t=function(a){return l.getRoot(a).hasClass("show")},u=function(a){a.addClass("expanded")},v=function(a){a.removeClass("expanded")},w=function(a,b){var c=a.find(n.SECTION_TOTAL_COUNT_CONTAINER),d=c.find(n.SECTION_TOTAL_COUNT);d.text(b),c.removeClass("hidden");var e=b>20?20:b,g=Array.apply(null,Array(e)).map(function(){return!0});f.render(o.CONVERSATIONS_LIST_ITEMS_PLACEHOLDER,{placeholders:g}).then(function(b){var c=a.find(n.PLACEHOLDER_CONTAINER);c.html(b)})["catch"](function(){})},x=function(a,b){var c=a.find(n.SECTION_UNREAD_COUNT);c.text(b),b>0&&c.removeClass("hidden")},y=function(b,d,e){var g=d.map(function(b){var c=b.messages.length?b.messages[b.messages.length-1]:null,d={id:b.id,imageurl:b.imageurl,name:b.name,subname:b.subname,unreadcount:b.unreadcount,lastmessagedate:c?c.timecreated:null,sentfromcurrentuser:c?c.useridfrom==e:null,lastmessage:c?a(c.text).text()||c.text:null};if(b.type==m.CONVERSATION_TYPES.PRIVATE){var f=b.members.reduce(function(a,b){return a||b.id==e||(a=b),a},null);d.userid=f.id,d.showonlinestatus=f.showonlinestatus,d.isonline=f.isonline,d.isblocked=f.isblocked}return b.type==m.CONVERSATION_TYPES.PUBLIC&&(d.lastsendername=b.members.reduce(function(a,b){return a||b.id!=c.useridfrom||(a=b.fullname),a},null)+":"),d});return f.render(o.CONVERSATIONS_LIST,{conversations:g}).then(function(a){return b.append(a),a})["catch"](c.exception)},z=function(a,b,d){return function(e,f){return h.getConversations(f,a,p+1,d,b).then(function(a){var b=a.conversations;return b.length>p?b=b.slice(0,-1):l.setLoadedAll(e,!0),d+=p,b.forEach(function(a){q[a.id]=a}),b})["catch"](c.exception)}},A=function(a){return a.find(n.SECTION_TOTAL_COUNT)},B=function(a){return a.find(n.SECTION_UNREAD_COUNT)},C=function(a){if(r){var b=A(a),c=parseInt(b.text());c+=1,b.text(c)}},D=function(a){if(r){var b=A(a),c=parseInt(b.text());c-=1,b.text(c)}},E=function(a){if(s){var b=B(a),c=parseInt(b.text());c-=1,b.text(c),c<1&&b.addClass("hidden")}},F=function(a,b){return a.find('[data-conversation-id="'+b+'"]')},G=function(a,b){return a.find('[data-user-id="'+b+'"]')},H=function(a){a.find(n.BLOCKED_ICON_CONTAINER).removeClass("hidden")},I=function(a){a.find(n.BLOCKED_ICON_CONTAINER).addClass("hidden")},J=function(b,c){var d=c.messages[c.messages.length-1],f="",h=[{key:"you",component:"core_message"},{key:"strftimetime24",component:"core_langconfig"}];return e.get_strings(h).then(function(a){return f=a[0],g.get([{timestamp:d.timeCreated,format:a[1]}])}).then(function(a){return a[0]}).then(function(c){var e=a(d.text).text();return e=d.fromLoggedInUser?f+" "+e:d.userFrom.fullname+": "+e,b.find(n.LAST_MESSAGE).html(e),b.find(n.LAST_MESSAGE_DATE).text(c).removeClass("hidden"),c})},K=function(b,d){var e=b.find(n.CONVERSATION),g="";if(!e.length){var h=l.getRoot(b);l.showContent(h),l.hideEmptyMessage(h)}var i=d.messages.length,j=i?d.messages[i-1]:null;j&&(g=a(j.text).text()||j.text);var k={id:d.id,name:d.name,subname:d.subname,lastmessagedate:j?j.timeCreated:null,sentfromcurrentuser:j?j.fromLoggedInUser:null,lastmessage:g,imageurl:d.imageUrl};return q[d.id]=d,f.render(o.CONVERSATIONS_LIST,{conversations:[k]}).then(function(a){var c=l.getContentContainer(b);return c.prepend(a)}).then(function(){return C(b)})["catch"](c.exception)},L=function(a,b){b.remove(),D(a);var c=a.find(n.CONVERSATION);if(!c.length){var d=l.getRoot(a);l.hideContent(d),l.showEmptyMessage(d)}},M=function(a,b){var c=b.find(n.UNREAD_COUNT);c.text("0"),c.addClass("hidden"),E(a)},N=function(c,e,f,g){var h=l.getRoot(c),m=c.find(n.TOGGLE);c.css("min-height",m.outerHeight()),c.on("show.bs.collapse",function(){u(c),l.show(h,e,y)}),c.on("hidden.bs.collapse",function(){v(c)}),d.subscribe(i.CONTACT_BLOCKED,function(a){var b=G(c,a);b.length&&H(b)}),d.subscribe(i.CONTACT_UNBLOCKED,function(a){var b=G(c,a);b.length&&I(b)}),d.subscribe(i.CONVERSATION_NEW_LAST_MESSAGE,function(a){if(!(f&&a.type!=f||g&&!a.isFavourite||!g&&a.isFavourite)){var b=a.id,d=F(c,b);d.length?J(d,a):K(c,a)}}),d.subscribe(i.CONVERSATION_DELETED,function(a){var b=F(c,a);b.length&&L(c,b)}),d.subscribe(i.CONVERSATION_READ,function(a){var b=F(c,a);b.length&&M(c,b)}),d.subscribe(i.CONVERSATION_SET_FAVOURITE,function(a){var b=null;!g||f&&f!=a.type?f==a.type&&(b=F(c,a.id),b.length&&L(c,b)):(b=F(c,a.id),b.length||K(c,a))}),d.subscribe(i.CONVERSATION_UNSET_FAVOURITE,function(a){var b=null;g?(b=F(c,a.id),b.length&&L(c,b)):f==a.type&&(b=F(c,a.id),b.length||K(c,a))}),b.define(c,[b.events.activate]),c.on(b.events.activate,n.CONVERSATION,function(b,c){var d=a(b.target).closest(n.CONVERSATION),e=d.attr("data-conversation-id"),f=q[e];j.go(k.VIEW_CONVERSATION,f),c.originalEvent.preventDefault()})},O=function(b,c,d,e,f){if(b=a(b),!b.attr("data-init")){var g=z(c,d,0);if(N(b,g,c,d),t(b)){u(b);var h=l.getRoot(b);l.show(h,g,y)}e.then(function(a){w(b,a),r=!0})["catch"](function(){}),f.then(function(a){x(b,a),r=!0})["catch"](function(){}),b.attr("data-init",!0)}};return{show:O,isVisible:t}});
\ No newline at end of file
diff --git a/message/amd/src/message_drawer_view_overview_section.js b/message/amd/src/message_drawer_view_overview_section.js
index 3045fcad4f7..c19b82cfdb1 100644
--- a/message/amd/src/message_drawer_view_overview_section.js
+++ b/message/amd/src/message_drawer_view_overview_section.js
@@ -160,7 +160,9 @@ function(
      */
     var render = function(contentContainer, conversations, userId) {
         var formattedConversations = conversations.map(function(conversation) {
+
             var lastMessage = conversation.messages.length ? conversation.messages[conversation.messages.length - 1] : null;
+
             var formattedConversation = {
                 id: conversation.id,
                 imageurl: conversation.imageurl,
@@ -186,6 +188,15 @@ function(
                 formattedConversation.isblocked = otherUser.isblocked;
             }
 
+            if (conversation.type == MessageDrawerViewConversationContants.CONVERSATION_TYPES.PUBLIC) {
+                formattedConversation.lastsendername = conversation.members.reduce(function(carry, member) {
+                    if (!carry && member.id == lastMessage.useridfrom) {
+                        carry = member.fullname;
+                    }
+                    return carry;
+                }, null) + ':';
+            }
+
             return formattedConversation;
         });
 
@@ -368,6 +379,8 @@ function(
 
                 if (message.fromLoggedInUser) {
                     lastMessage = youString + ' ' + lastMessage;
+                } else {
+                    lastMessage = message.userFrom.fullname + ': ' + lastMessage;
                 }
 
                 element.find(SELECTORS.LAST_MESSAGE).html(lastMessage);
diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index 3ffe6423af6..a94d9c12ff1 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -75,7 +75,8 @@
             {{/subname}}
             <p class="m-0 font-weight-light text-truncate" data-region="last-message">
                 {{#sentfromcurrentuser}}{{#str}} you, core_message {{/str}}{{/sentfromcurrentuser}}
-                {{lastmessage}}
+                {{^sentfromcurrentuser}}{{lastsendername}}{{/sentfromcurrentuser}}
+                <span class="text-muted">{{lastmessage}}</span>
             </p>
         </div>
 
diff --git a/theme/bootstrapbase/less/moodle/bs4-compat.less b/theme/bootstrapbase/less/moodle/bs4-compat.less
index 1645a32276e..612420d38b4 100644
--- a/theme/bootstrapbase/less/moodle/bs4-compat.less
+++ b/theme/bootstrapbase/less/moodle/bs4-compat.less
@@ -630,7 +630,9 @@
         width: 24px !important;
     }
 }
-
+.text-muted {
+    .muted;
+}
 .dir-rtl {
     .dir-rtl-hide {
         display: none;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 29f47c27289..d082affd727 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -22337,6 +22337,9 @@ ul.indented-list {
   height: 24px !important;
   width: 24px !important;
 }
+.text-muted {
+  color: #999;
+}
 .dir-rtl .dir-rtl-hide {
   display: none;
 }

From 051c675fd203851af3480e335202fb76a9156a69 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 14:03:12 +0100
Subject: [PATCH 09/18] MDL-64099 message: Add a border in between messages and
 contacts

---
 .../message_drawer_contacts_list.mustache     |  2 +-
 ...message_drawer_conversations_list.mustache |  2 +-
 .../message_drawer_messages_list.mustache     |  2 +-
 .../message_drawer_non_contacts_list.mustache |  2 +-
 ...view_group_info_participants_list.mustache |  2 +-
 ...rawer_view_search_results_content.mustache | 20 +++++++++----------
 theme/boost/scss/moodle/message.scss          | 10 ++++++++++
 theme/boost/style/moodle.css                  |  7 +++++++
 theme/bootstrapbase/less/moodle/message.less  | 14 +++++++++++++
 theme/bootstrapbase/style/moodle.css          | 12 +++++++++++
 10 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/message/templates/message_drawer_contacts_list.mustache b/message/templates/message_drawer_contacts_list.mustache
index 8f9b3aa6a64..37f7fc94fa1 100644
--- a/message/templates/message_drawer_contacts_list.mustache
+++ b/message/templates/message_drawer_contacts_list.mustache
@@ -37,7 +37,7 @@
 {{#contacts}}
     <a
         href="#"
-        class="p-2 d-flex list-group-item list-group-item-action border-0"
+        class="p-2 d-flex list-group-item list-group-item-action"
         data-route="view-conversation"
         {{#conversationid}}
             data-route-param-1="{{.}}"
diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index a94d9c12ff1..149d87267e3 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -37,7 +37,7 @@
 {{#conversations}}
     <a
         href="#"
-        class="p-2 d-flex list-group-item list-group-item-action border-0 align-items-center"
+        class="p-2 d-flex list-group-item list-group-item-action align-items-center"
         data-conversation-id="{{id}}"
         {{#userid}}
             data-user-id="{{.}}"
diff --git a/message/templates/message_drawer_messages_list.mustache b/message/templates/message_drawer_messages_list.mustache
index 68c49532a13..90ba32f8b2c 100644
--- a/message/templates/message_drawer_messages_list.mustache
+++ b/message/templates/message_drawer_messages_list.mustache
@@ -37,7 +37,7 @@
 {{#messages}}
     <a
         href="#"
-        class="p-2 d-flex list-group-item list-group-item-action border-0 align-items-center"
+        class="p-2 d-flex list-group-item list-group-item-action align-items-center"
         data-route="view-conversation"
         {{#conversationid}}
             data-route-param-1="{{.}}"
diff --git a/message/templates/message_drawer_non_contacts_list.mustache b/message/templates/message_drawer_non_contacts_list.mustache
index f3d8ae217f4..19852d9ad5f 100644
--- a/message/templates/message_drawer_non_contacts_list.mustache
+++ b/message/templates/message_drawer_non_contacts_list.mustache
@@ -37,7 +37,7 @@
 {{#noncontacts}}
     <a
         href="#"
-        class="p-2 d-flex list-group-item list-group-item-action border-0"
+        class="p-2 d-flex list-group-item list-group-item-action"
         data-route="view-conversation"
         {{#conversationid}}
             data-route-param-1="{{.}}"
diff --git a/message/templates/message_drawer_view_group_info_participants_list.mustache b/message/templates/message_drawer_view_group_info_participants_list.mustache
index c863e35e3c9..fc7d83966e3 100644
--- a/message/templates/message_drawer_view_group_info_participants_list.mustache
+++ b/message/templates/message_drawer_view_group_info_participants_list.mustache
@@ -37,7 +37,7 @@
 {{#contacts}}
     <a
         href="#"
-        class="p-2 d-flex list-group-item list-group-item-action border-0"
+        class="p-2 d-flex list-group-item list-group-item-action"
         data-route="view-conversation"
         {{#conversationid}}
             data-route-param-1="{{.}}"
diff --git a/message/templates/message_drawer_view_search_results_content.mustache b/message/templates/message_drawer_view_search_results_content.mustache
index 624ee128b76..7ffc1830ccc 100644
--- a/message/templates/message_drawer_view_search_results_content.mustache
+++ b/message/templates/message_drawer_view_search_results_content.mustache
@@ -36,18 +36,18 @@
 }}
 
 <div class="d-flex flex-column">
-    <div class="mb-3 bg-white p-2">
-        <div data-region="contacts-container">
-            <h4 class="h6">{{#str}} contacts, core_message {{/str}}</h4>
+    <div class="mb-3 bg-white">
+        <div data-region="contacts-container"  class="pt-2">
+            <h4 class="h6 px-2">{{#str}} contacts, core_message {{/str}}</h4>
             <div class="list-group" data-region="list"></div>
-            <p class="hidden" data-region="no-results-container">
+            <p class="hidden px-2" data-region="no-results-container">
                 {{#str}} searchnocontactsfound, core_message {{/str}}
             </p>
         </div>
-        <div data-region="non-contacts-container">
-            <h4 class="h6">{{#str}} noncontacts, core_message {{/str}}</h4>
+        <div data-region="non-contacts-container" class="pt-2 border-top">
+            <h4 class="h6 px-2">{{#str}} noncontacts, core_message {{/str}}</h4>
             <div class="list-group" data-region="list"></div>
-            <p class="hidden" data-region="no-results-container">
+            <p class="hidden px-2" data-region="no-results-container">
                 {{#str}} searchnononcontactsfound, core_message {{/str}}
             </p>
         </div>
@@ -58,11 +58,11 @@
             </button>
         </div>
     </div>
-    <div class="bg-white p-2">
+    <div class="bg-white">
         <div data-region="messages-container">
-            <h4 class="h6">{{#str}} messages, core_message {{/str}}</h4>
+            <h4 class="h6 px-2 pt-2">{{#str}} messages, core_message {{/str}}</h4>
             <div class="list-group" data-region="list"></div>
-            <p class="hidden" data-region="no-results-container">
+            <p class="hidden px-2" data-region="no-results-container">
                 {{#str}} searchnomessagesfound, core_message {{/str}}
             </p>
         </div>
diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index dc695527263..5106a4c6a1d 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -1328,6 +1328,16 @@ $message-drawer-width: 320px;
             }
         }
     }
+    .list-group .list-group-item {
+        border-left: 0;
+        border-right: 0;
+        &:first-child {
+            border-top: 0;
+        }
+        &:last-child {
+            border-bottom: 0;
+        }
+    }
 }
 
 .dir-rtl {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 37dfb4c635c..a6d4da70e15 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14187,6 +14187,13 @@ a.ygtvspacer:hover {
       display: flex; }
   .message-drawer .view-conversation .content-message-container img {
     max-width: 100%; }
+  .message-drawer .list-group .list-group-item {
+    border-left: 0;
+    border-right: 0; }
+    .message-drawer .list-group .list-group-item:first-child {
+      border-top: 0; }
+    .message-drawer .list-group .list-group-item:last-child {
+      border-bottom: 0; }
 
 .dir-rtl .message-drawer {
   box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.08); }
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index fb52a7ece27..df95549d377 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -1330,6 +1330,20 @@
             }
         }
     }
+    .list-group {
+        .list-group-item {
+            border-top: 1px solid #e3e3e3;
+            border-bottom: 1px solid #e3e3e3;
+            margin-bottom: -1px;
+            &:first-child {
+                border-top: 0;
+            }
+            &:last-child {
+                border-bottom: 0;
+                margin-bottom: 0;
+            }
+        }
+    }
 }
 
 @media (max-width: 480px) {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index d082affd727..5e8cdf6205c 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -9221,6 +9221,18 @@ a.ygtvspacer:hover {
 .message-drawer .view-conversation .content-message-container img {
   max-width: 100%;
 }
+.message-drawer .list-group .list-group-item {
+  border-top: 1px solid #e3e3e3;
+  border-bottom: 1px solid #e3e3e3;
+  margin-bottom: -1px;
+}
+.message-drawer .list-group .list-group-item:first-child {
+  border-top: 0;
+}
+.message-drawer .list-group .list-group-item:last-child {
+  border-bottom: 0;
+  margin-bottom: 0;
+}
 @media (max-width: 480px) {
   .messaging-area-container .messaging-area .messages-area.editing .messages-header {
     height: 80px;

From e677e0e53b482e374bff092918c27bc4cec59631 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 14:08:49 +0100
Subject: [PATCH 10/18] MDL-64099 message: Replace badge with rectangular shape

---
 message/templates/message_drawer_conversations_list.mustache | 2 +-
 message/templates/message_drawer_messages_list.mustache      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index 149d87267e3..0b9f0fcfe6e 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -81,7 +81,7 @@
         </div>
 
         <span
-            class="badge badge-pill badge-primary bg-primary rounded-circle {{^unreadcount}}hidden{{/unreadcount}}"
+            class="badge badge-pill badge-primary bg-primary {{^unreadcount}}hidden{{/unreadcount}}"
             data-region="unread-count"
         >
             {{unreadcount}}
diff --git a/message/templates/message_drawer_messages_list.mustache b/message/templates/message_drawer_messages_list.mustache
index 90ba32f8b2c..3373a794161 100644
--- a/message/templates/message_drawer_messages_list.mustache
+++ b/message/templates/message_drawer_messages_list.mustache
@@ -84,7 +84,7 @@
         </div>
 
         <span
-            class="badge badge-pill badge-primary bg-primary rounded-circle {{^unreadcount}}hidden{{/unreadcount}}"
+            class="badge badge-pill badge-primary bg-primary {{^unreadcount}}hidden{{/unreadcount}}"
             data-region="unread-count"
         >
             {{unreadcount}}

From 2edfbf880a47e0bcb7b3a2c809330d2ced2e4e40 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 14:29:56 +0100
Subject: [PATCH 11/18] MDL-64099 message: Align group image to container top

---
 message/templates/message_drawer_conversations_list.mustache | 2 +-
 theme/bootstrapbase/less/moodle/bs4-compat.less              | 3 +++
 theme/bootstrapbase/style/moodle.css                         | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index 0b9f0fcfe6e..27cab59c795 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -45,7 +45,7 @@
     >
         {{#imageurl}}
             <img
-                class="rounded-circle"
+                class="rounded-circle align-self-start"
                 src="{{{.}}}"
                 alt="{{name}}"
                 aria-hidden="true"
diff --git a/theme/bootstrapbase/less/moodle/bs4-compat.less b/theme/bootstrapbase/less/moodle/bs4-compat.less
index 612420d38b4..2936d935195 100644
--- a/theme/bootstrapbase/less/moodle/bs4-compat.less
+++ b/theme/bootstrapbase/less/moodle/bs4-compat.less
@@ -562,6 +562,9 @@
 .position-relative {
     position: relative !important;
 }
+.align-self-start {
+    align-self: flex-start !important;
+}
 .align-self-center {
     align-self: center !important;
 }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 5e8cdf6205c..7d95adddb04 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -22281,6 +22281,9 @@ ul.indented-list {
 .position-relative {
   position: relative !important;
 }
+.align-self-start {
+  align-self: flex-start !important;
+}
 .align-self-center {
   align-self: center !important;
 }

From e2cf9af22d807e4569302d7d83e046e0bed885a1 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 14:50:37 +0100
Subject: [PATCH 12/18] MDL-64099 message: conversation long sender names
 truncate

---
 .../message_drawer_view_conversation_body_message.mustache    | 4 ++--
 .../message_drawer_view_conversation_body_message.mustache    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/message/templates/message_drawer_view_conversation_body_message.mustache b/message/templates/message_drawer_view_conversation_body_message.mustache
index 1c41d2629c1..5bfca2d0eb9 100644
--- a/message/templates/message_drawer_view_conversation_body_message.mustache
+++ b/message/templates/message_drawer_view_conversation_body_message.mustache
@@ -44,7 +44,7 @@
 >
     <div class="d-flex align-items-center {{^fromloggedinuser}}pb-2{{/fromloggedinuser}}">
         {{^fromloggedinuser}}
-        <div>
+        <div style="flex-shrink: 0">
             <img
                 class="rounded-circle"
                 src="{{{userfrom.profileimageurl}}}"
@@ -53,7 +53,7 @@
                 style="height: 30px"
             >
         </div>
-        <div class="pl-2 pr-2">
+        <div class="text-truncate pl-2 pr-2">
             <h6 class="text-truncate m-0 font-weight-bold">{{userfrom.fullname}}</h6>
         </div>
         {{/fromloggedinuser}}
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
index 055d6d0fc64..a8173b65341 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_body_message.mustache
@@ -48,7 +48,7 @@
 >
     <div class="d-flex align-items-center {{^fromloggedinuser}}pb-2{{/fromloggedinuser}}">
         {{^fromloggedinuser}}
-        <div>
+        <div style="flex-shrink: 0">
             <img
                 class="rounded-circle"
                 src="{{{userfrom.profileimageurl}}}"
@@ -57,7 +57,7 @@
                 style="height: 30px"
             >
         </div>
-        <div class="pl-2 pr-2">
+        <div class="text-truncate pl-2 pr-2">
             <h6 class="text-truncate m-0"><strong>{{userfrom.fullname}}</strong></h6>
         </div>
         {{/fromloggedinuser}}

From 986d1a20f6a07fd6222bc417961182e99d9bd891 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 17:00:47 +0100
Subject: [PATCH 13/18] MDL-64099 message: Move timestamps all the way to the
 right

---
 ...message_drawer_conversations_list.mustache | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index 27cab59c795..24b14bb71cd 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -37,7 +37,7 @@
 {{#conversations}}
     <a
         href="#"
-        class="p-2 d-flex list-group-item list-group-item-action align-items-center"
+        class="py-0 px-2 d-flex list-group-item list-group-item-action align-items-center"
         data-conversation-id="{{id}}"
         {{#userid}}
             data-user-id="{{.}}"
@@ -45,7 +45,7 @@
     >
         {{#imageurl}}
             <img
-                class="rounded-circle align-self-start"
+                class="rounded-circle align-self-start mt-2"
                 src="{{{.}}}"
                 alt="{{name}}"
                 aria-hidden="true"
@@ -55,20 +55,12 @@
         {{#showonlinestatus}}
             <span class="contact-status {{#isonline}}online{{/isonline}}"></span>
         {{/showonlinestatus}}
-        <div class="w-100 text-truncate ml-2">
+        <div class="w-100 text-truncate ml-2 my-2">
             <div class="d-flex">
                 <strong class="m-0 text-truncate">{{name}}</strong>
                 <span class="{{^isblocked}}hidden{{/isblocked}}" data-region="contact-icon-blocked">
                     {{#pix}} t/block, core, {{#str}} contactblocked, message {{/str}} {{/pix}}
                 </span>
-                <div
-                    class="ml-auto small {{^lastmessagedate}}hidden{{/lastmessagedate}}"
-                    data-region="last-message-date"
-                >
-                    {{#lastmessagedate}}
-                        {{#userdate}} {{.}}, {{#str}} strftimetime24, core_langconfig  {{/str}} {{/userdate}}
-                    {{/lastmessagedate}}
-                </div>
             </div>
             {{#subname}}
                 <p class="m-0 text-truncate">{{.}}</p>
@@ -79,16 +71,28 @@
                 <span class="text-muted">{{lastmessage}}</span>
             </p>
         </div>
+        <div class="d-flex align-self-stretch">
+            <div
+                class="ml-auto small position-absolute text-muted {{^lastmessagedate}}hidden{{/lastmessagedate}}"
+                data-region="last-message-date"
+                style="right: 0.5rem"
+            >
+                {{#lastmessagedate}}
+                    {{#userdate}} {{.}}, {{#str}} strftimetime24, core_langconfig  {{/str}} {{/userdate}}
+                {{/lastmessagedate}}
+            </div>
+            <div class="d-flex align-self-center align-items-center">
+                <span
+                    class="badge badge-pill badge-primary bg-primary {{^unreadcount}}hidden{{/unreadcount}}"
+                    data-region="unread-count"
+                >
+                    {{unreadcount}}
+                </span>
 
-        <span
-            class="badge badge-pill badge-primary bg-primary {{^unreadcount}}hidden{{/unreadcount}}"
-            data-region="unread-count"
-        >
-            {{unreadcount}}
-        </span>
-
-        <div class="text-muted">
-            {{> core_message/message_drawer_icon_forward }}
+                <div class="text-muted ml-auto">
+                    {{> core_message/message_drawer_icon_forward }}
+                </div>
+            </div>
         </div>
     </a>
 {{/conversations}}

From dfd6eec2b4b943b52ab2bf1a9bfd75e9fa3106d8 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 17:22:05 +0100
Subject: [PATCH 14/18] MDL-64099 message: Make collapsible headers bold

---
 .../templates/message_drawer_view_overview_section.mustache | 4 ++--
 theme/boost/scss/moodle/message.scss                        | 6 ++++++
 theme/boost/style/moodle.css                                | 2 ++
 theme/bootstrapbase/less/moodle/message.less                | 6 ++++++
 theme/bootstrapbase/style/moodle.css                        | 4 ++++
 .../message_drawer_view_overview_section.mustache           | 5 +++--
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/message/templates/message_drawer_view_overview_section.mustache b/message/templates/message_drawer_view_overview_section.mustache
index a36c27e7e4c..b0e1135cff3 100644
--- a/message/templates/message_drawer_view_overview_section.mustache
+++ b/message/templates/message_drawer_view_overview_section.mustache
@@ -53,7 +53,7 @@
             <span class="expanded-icon-container">
                 {{#pix}} t/expanded, core {{/pix}}
             </span>
-            {{$title}}{{/title}}
+            <span class="font-weight-bold">{{$title}}{{/title}}</span>
             <span class="hidden ml-1" data-region="section-total-count-container">
                 (<span data-region="section-total-count">{{count.total}}</span>)
             </span>
@@ -73,4 +73,4 @@
             data-parent="#message-drawer-view-overview-container"
         {{/rootattributes}}
     {{/ core_message/message_drawer_lazy_load_list }}
-</div>
\ No newline at end of file
+</div>
diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index 5106a4c6a1d..593f58c06db 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -1269,6 +1269,12 @@ $message-drawer-width: 320px;
     .btn-link {
         color: inherit;
     }
+    .btn-link {
+        &:hover,
+        &:focus {
+            text-decoration: none;
+        }
+    }
 
     .icon {
         margin-right: 0;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index a6d4da70e15..d1dcffeb2ca 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14133,6 +14133,8 @@ a.ygtvspacer:hover {
   .message-drawer a,
   .message-drawer .btn-link {
     color: inherit; }
+  .message-drawer .btn-link:hover, .message-drawer .btn-link:focus {
+    text-decoration: none; }
   .message-drawer .icon {
     margin-right: 0; }
   .message-drawer .overview-section-toggle .collapsed-icon-container {
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index df95549d377..e9b56dd1119 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -1268,6 +1268,12 @@
         text-decoration: none;
         color: inherit;
     }
+    .btn-link {
+        &:hover,
+        &:focus {
+            text-decoration: none;
+        }
+    }
 
     .message {
         p {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 7d95adddb04..ac617aee2c8 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -9180,6 +9180,10 @@ a.ygtvspacer:hover {
   text-decoration: none;
   color: inherit;
 }
+.message-drawer .btn-link:hover,
+.message-drawer .btn-link:focus {
+  text-decoration: none;
+}
 .message-drawer .message p {
   margin: 0;
 }
diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_section.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_section.mustache
index 69b32f7435a..28ce1fef979 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_section.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_overview_section.mustache
@@ -35,6 +35,7 @@
     adding ".in" to ".show"
     adding .accordion-group to the main container div
     adding expanded to the .accordion-group if required for toggle icons to work.
+    changing span.font-weight-bold to strong
 
     Example context (json):
     {}
@@ -59,7 +60,7 @@
             <span class="expanded-icon-container">
                 {{#pix}} t/expanded, core {{/pix}}
             </span>
-            {{$title}}{{/title}}
+            <strong>{{$title}}{{/title}}</strong>
             <span class="hidden ml-1" data-region="section-total-count-container">
                 (<span data-region="section-total-count">{{count.total}}</span>)
             </span>
@@ -79,4 +80,4 @@
             data-parent="#message-drawer-view-overview-container"
         {{/rootattributes}}
     {{/ core_message/message_drawer_lazy_load_list }}
-</div>
\ No newline at end of file
+</div>

From 347fb901a72b0f899099b94439b57181ca2c5a0e Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 17:33:50 +0100
Subject: [PATCH 15/18] MDL-64099 message: Highlight the collapsible header on
 hover

---
 theme/boost/scss/moodle/message.scss         | 1 +
 theme/boost/style/moodle.css                 | 1 +
 theme/bootstrapbase/less/moodle/message.less | 1 +
 theme/bootstrapbase/style/moodle.css         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index 593f58c06db..9456f6ed264 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -1272,6 +1272,7 @@ $message-drawer-width: 320px;
     .btn-link {
         &:hover,
         &:focus {
+            background-color: rgba($black, .035);
             text-decoration: none;
         }
     }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index d1dcffeb2ca..08436c4e1de 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14134,6 +14134,7 @@ a.ygtvspacer:hover {
   .message-drawer .btn-link {
     color: inherit; }
   .message-drawer .btn-link:hover, .message-drawer .btn-link:focus {
+    background-color: rgba(0, 0, 0, 0.035);
     text-decoration: none; }
   .message-drawer .icon {
     margin-right: 0; }
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index e9b56dd1119..474b3e3c2d0 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -1271,6 +1271,7 @@
     .btn-link {
         &:hover,
         &:focus {
+            background-color: darken(@wellBackground, 5%);
             text-decoration: none;
         }
     }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index ac617aee2c8..22683e06dab 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -9182,6 +9182,7 @@ a.ygtvspacer:hover {
 }
 .message-drawer .btn-link:hover,
 .message-drawer .btn-link:focus {
+  background-color: #e8e8e8;
   text-decoration: none;
 }
 .message-drawer .message p {

From 4631749c5ac79ff195e9916ea988fddb28025a94 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Thu, 22 Nov 2018 18:02:19 +0100
Subject: [PATCH 16/18] MDL-64099 message: Hide scrollbar on section collapsing

---
 message/templates/message_drawer_lazy_load_list.mustache | 1 -
 theme/boost/scss/moodle/message.scss                     | 8 ++++++++
 theme/boost/style/moodle.css                             | 4 ++++
 theme/bootstrapbase/less/moodle/message.less             | 4 +++-
 theme/bootstrapbase/style/moodle.css                     | 3 +++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/message/templates/message_drawer_lazy_load_list.mustache b/message/templates/message_drawer_lazy_load_list.mustache
index 4079ed18f58..f1c2cd85452 100644
--- a/message/templates/message_drawer_lazy_load_list.mustache
+++ b/message/templates/message_drawer_lazy_load_list.mustache
@@ -35,7 +35,6 @@
 }}
 <div
     class="{{$rootclasses}}{{/rootclasses}}"
-    style="overflow-y: auto"
     aria-live="polite"
     data-region="lazy-load-list"
     data-user-id="{{loggedinuser.id}}"
diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index 9456f6ed264..fdf3e092f77 100644
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -1345,6 +1345,14 @@ $message-drawer-width: 320px;
             border-bottom: 0;
         }
     }
+    .section {
+        .collapse {
+            overflow-y: auto;
+        }
+        .collapsing {
+            overflow: hidden;
+        }
+    }
 }
 
 .dir-rtl {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 08436c4e1de..feff2f274df 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -14197,6 +14197,10 @@ a.ygtvspacer:hover {
       border-top: 0; }
     .message-drawer .list-group .list-group-item:last-child {
       border-bottom: 0; }
+  .message-drawer .section .collapse {
+    overflow-y: auto; }
+  .message-drawer .section .collapsing {
+    overflow: hidden; }
 
 .dir-rtl .message-drawer {
   box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.08); }
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index 474b3e3c2d0..f452650ea94 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -1275,7 +1275,9 @@
             text-decoration: none;
         }
     }
-
+    .accordion-group .collapse.in {
+        overflow-y: auto;
+    }
     .message {
         p {
             margin: 0;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 22683e06dab..03dcfb7fdb3 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -9185,6 +9185,9 @@ a.ygtvspacer:hover {
   background-color: #e8e8e8;
   text-decoration: none;
 }
+.message-drawer .accordion-group .collapse.in {
+  overflow-y: auto;
+}
 .message-drawer .message p {
   margin: 0;
 }

From 99cbd6197a552da1662e526a26d69dbd57740760 Mon Sep 17 00:00:00 2001
From: Bas Brands <bas@moodle.com>
Date: Fri, 23 Nov 2018 15:40:36 +0100
Subject: [PATCH 17/18] MDL-64099 message: correct dropdown container html

in the bootstrapbase overridden template <ul> should
be used for the dropdown container
---
 ...awer_view_conversation_header_content_type_public.mustache | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
index 8d1263f8289..416da1240db 100644
--- a/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
+++ b/theme/bootstrapbase/templates/core_message/message_drawer_view_conversation_header_content_type_public.mustache
@@ -74,7 +74,7 @@
             <button class="btn btn-link btn-icon icon-size-3" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 {{#pix}} i/moremenu, core {{/pix}}
             </button>
-            <div class="dropdown-menu pull-right">
+            <ul class="dropdown-menu pull-right">
                 <li data-action="view-group-info">
                     <a class="dropdown-item" href="#">
                         {{#str}} groupinfo, core_message {{/str}}
@@ -90,7 +90,7 @@
                         {{#str}} removefromfavourites, core_message {{/str}}
                     </a>
                 </li>
-            </div>
+            </ul>
         </div>
     </div>
     <div class="d-flex">

From 12d238100da56a0722d89ae7fa1e8cb8a0818314 Mon Sep 17 00:00:00 2001
From: Ryan Wyllie <ryan@moodle.com>
Date: Mon, 26 Nov 2018 14:28:10 +0800
Subject: [PATCH 18/18] MDL-64099 message: fix last message and date in group
 conversations

---
 lang/en/message.php                           |  2 ++
 ...essage_drawer_view_overview_section.min.js |  2 +-
 .../message_drawer_view_overview_section.js   | 23 ++++++++-------
 ...message_drawer_conversations_list.mustache | 28 +++++++++++++++----
 theme/boost/scss/moodle/core.scss             |  4 +++
 theme/boost/style/moodle.css                  |  4 +++
 theme/bootstrapbase/less/moodle/core.less     |  4 +++
 theme/bootstrapbase/style/moodle.css          |  4 +++
 8 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/lang/en/message.php b/lang/en/message.php
index 740b9290a13..0a3d9e59823 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -46,6 +46,7 @@ $string['contactblocked'] = 'Contact blocked';
 $string['contactrequests'] = 'Contact requests';
 $string['contactrequestsent'] = 'Contact request sent';
 $string['contacts'] = 'Contacts';
+$string['conversationlastmessage'] = '{$a->sender}: {$a->message}';
 $string['decline'] = 'Decline';
 $string['defaultmessageoutputs'] = 'Default message outputs';
 $string['defaults'] = 'Defaults';
@@ -250,6 +251,7 @@ $string['viewunreadmessageswith'] = 'View unread messages with {$a}';
 $string['writeamessage'] = 'Write a message...';
 $string['wouldliketocontactyou'] = 'Would like to contact you';
 $string['you'] = 'You:';
+$string['yousender'] = 'You';
 $string['youhaveblockeduser'] = 'You have blocked this user in the past';
 $string['yourcontactrequestpending'] = 'Your contact request is pending with {$a}';
 
diff --git a/message/amd/build/message_drawer_view_overview_section.min.js b/message/amd/build/message_drawer_view_overview_section.min.js
index be8d047a26b..f96085c4685 100644
--- a/message/amd/build/message_drawer_view_overview_section.min.js
+++ b/message/amd/build/message_drawer_view_overview_section.min.js
@@ -1 +1 @@
-define(["jquery","core/custom_interaction_events","core/notification","core/pubsub","core/str","core/templates","core/user_date","core_message/message_repository","core_message/message_drawer_events","core_message/message_drawer_router","core_message/message_drawer_routes","core_message/message_drawer_lazy_load_list","core_message/message_drawer_view_conversation_constants"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n={TOGGLE:'[data-region="toggle"]',CONVERSATION:"[data-conversation-id]",BLOCKED_ICON_CONTAINER:'[data-region="contact-icon-blocked"]',LAST_MESSAGE:'[data-region="last-message"]',LAST_MESSAGE_DATE:'[data-region="last-message-date"]',UNREAD_COUNT:'[data-region="unread-count"]',SECTION_TOTAL_COUNT:'[data-region="section-total-count"]',SECTION_TOTAL_COUNT_CONTAINER:'[data-region="section-total-count-container"]',SECTION_UNREAD_COUNT:'[data-region="section-unread-count"]',PLACEHOLDER_CONTAINER:'[data-region="placeholder-container"]'},o={CONVERSATIONS_LIST:"core_message/message_drawer_conversations_list",CONVERSATIONS_LIST_ITEMS_PLACEHOLDER:"core_message/message_drawer_conversations_list_items_placeholder"},p=50,q={},r=!1,s=!1,t=function(a){return l.getRoot(a).hasClass("show")},u=function(a){a.addClass("expanded")},v=function(a){a.removeClass("expanded")},w=function(a,b){var c=a.find(n.SECTION_TOTAL_COUNT_CONTAINER),d=c.find(n.SECTION_TOTAL_COUNT);d.text(b),c.removeClass("hidden");var e=b>20?20:b,g=Array.apply(null,Array(e)).map(function(){return!0});f.render(o.CONVERSATIONS_LIST_ITEMS_PLACEHOLDER,{placeholders:g}).then(function(b){var c=a.find(n.PLACEHOLDER_CONTAINER);c.html(b)})["catch"](function(){})},x=function(a,b){var c=a.find(n.SECTION_UNREAD_COUNT);c.text(b),b>0&&c.removeClass("hidden")},y=function(b,d,e){var g=d.map(function(b){var c=b.messages.length?b.messages[b.messages.length-1]:null,d={id:b.id,imageurl:b.imageurl,name:b.name,subname:b.subname,unreadcount:b.unreadcount,lastmessagedate:c?c.timecreated:null,sentfromcurrentuser:c?c.useridfrom==e:null,lastmessage:c?a(c.text).text()||c.text:null};if(b.type==m.CONVERSATION_TYPES.PRIVATE){var f=b.members.reduce(function(a,b){return a||b.id==e||(a=b),a},null);d.userid=f.id,d.showonlinestatus=f.showonlinestatus,d.isonline=f.isonline,d.isblocked=f.isblocked}return b.type==m.CONVERSATION_TYPES.PUBLIC&&(d.lastsendername=b.members.reduce(function(a,b){return a||b.id!=c.useridfrom||(a=b.fullname),a},null)+":"),d});return f.render(o.CONVERSATIONS_LIST,{conversations:g}).then(function(a){return b.append(a),a})["catch"](c.exception)},z=function(a,b,d){return function(e,f){return h.getConversations(f,a,p+1,d,b).then(function(a){var b=a.conversations;return b.length>p?b=b.slice(0,-1):l.setLoadedAll(e,!0),d+=p,b.forEach(function(a){q[a.id]=a}),b})["catch"](c.exception)}},A=function(a){return a.find(n.SECTION_TOTAL_COUNT)},B=function(a){return a.find(n.SECTION_UNREAD_COUNT)},C=function(a){if(r){var b=A(a),c=parseInt(b.text());c+=1,b.text(c)}},D=function(a){if(r){var b=A(a),c=parseInt(b.text());c-=1,b.text(c)}},E=function(a){if(s){var b=B(a),c=parseInt(b.text());c-=1,b.text(c),c<1&&b.addClass("hidden")}},F=function(a,b){return a.find('[data-conversation-id="'+b+'"]')},G=function(a,b){return a.find('[data-user-id="'+b+'"]')},H=function(a){a.find(n.BLOCKED_ICON_CONTAINER).removeClass("hidden")},I=function(a){a.find(n.BLOCKED_ICON_CONTAINER).addClass("hidden")},J=function(b,c){var d=c.messages[c.messages.length-1],f="",h=[{key:"you",component:"core_message"},{key:"strftimetime24",component:"core_langconfig"}];return e.get_strings(h).then(function(a){return f=a[0],g.get([{timestamp:d.timeCreated,format:a[1]}])}).then(function(a){return a[0]}).then(function(c){var e=a(d.text).text();return e=d.fromLoggedInUser?f+" "+e:d.userFrom.fullname+": "+e,b.find(n.LAST_MESSAGE).html(e),b.find(n.LAST_MESSAGE_DATE).text(c).removeClass("hidden"),c})},K=function(b,d){var e=b.find(n.CONVERSATION),g="";if(!e.length){var h=l.getRoot(b);l.showContent(h),l.hideEmptyMessage(h)}var i=d.messages.length,j=i?d.messages[i-1]:null;j&&(g=a(j.text).text()||j.text);var k={id:d.id,name:d.name,subname:d.subname,lastmessagedate:j?j.timeCreated:null,sentfromcurrentuser:j?j.fromLoggedInUser:null,lastmessage:g,imageurl:d.imageUrl};return q[d.id]=d,f.render(o.CONVERSATIONS_LIST,{conversations:[k]}).then(function(a){var c=l.getContentContainer(b);return c.prepend(a)}).then(function(){return C(b)})["catch"](c.exception)},L=function(a,b){b.remove(),D(a);var c=a.find(n.CONVERSATION);if(!c.length){var d=l.getRoot(a);l.hideContent(d),l.showEmptyMessage(d)}},M=function(a,b){var c=b.find(n.UNREAD_COUNT);c.text("0"),c.addClass("hidden"),E(a)},N=function(c,e,f,g){var h=l.getRoot(c),m=c.find(n.TOGGLE);c.css("min-height",m.outerHeight()),c.on("show.bs.collapse",function(){u(c),l.show(h,e,y)}),c.on("hidden.bs.collapse",function(){v(c)}),d.subscribe(i.CONTACT_BLOCKED,function(a){var b=G(c,a);b.length&&H(b)}),d.subscribe(i.CONTACT_UNBLOCKED,function(a){var b=G(c,a);b.length&&I(b)}),d.subscribe(i.CONVERSATION_NEW_LAST_MESSAGE,function(a){if(!(f&&a.type!=f||g&&!a.isFavourite||!g&&a.isFavourite)){var b=a.id,d=F(c,b);d.length?J(d,a):K(c,a)}}),d.subscribe(i.CONVERSATION_DELETED,function(a){var b=F(c,a);b.length&&L(c,b)}),d.subscribe(i.CONVERSATION_READ,function(a){var b=F(c,a);b.length&&M(c,b)}),d.subscribe(i.CONVERSATION_SET_FAVOURITE,function(a){var b=null;!g||f&&f!=a.type?f==a.type&&(b=F(c,a.id),b.length&&L(c,b)):(b=F(c,a.id),b.length||K(c,a))}),d.subscribe(i.CONVERSATION_UNSET_FAVOURITE,function(a){var b=null;g?(b=F(c,a.id),b.length&&L(c,b)):f==a.type&&(b=F(c,a.id),b.length||K(c,a))}),b.define(c,[b.events.activate]),c.on(b.events.activate,n.CONVERSATION,function(b,c){var d=a(b.target).closest(n.CONVERSATION),e=d.attr("data-conversation-id"),f=q[e];j.go(k.VIEW_CONVERSATION,f),c.originalEvent.preventDefault()})},O=function(b,c,d,e,f){if(b=a(b),!b.attr("data-init")){var g=z(c,d,0);if(N(b,g,c,d),t(b)){u(b);var h=l.getRoot(b);l.show(h,g,y)}e.then(function(a){w(b,a),r=!0})["catch"](function(){}),f.then(function(a){x(b,a),r=!0})["catch"](function(){}),b.attr("data-init",!0)}};return{show:O,isVisible:t}});
\ No newline at end of file
+define(["jquery","core/custom_interaction_events","core/notification","core/pubsub","core/str","core/templates","core/user_date","core_message/message_repository","core_message/message_drawer_events","core_message/message_drawer_router","core_message/message_drawer_routes","core_message/message_drawer_lazy_load_list","core_message/message_drawer_view_conversation_constants"],function(a,b,c,d,e,f,g,h,i,j,k,l,m){var n={TOGGLE:'[data-region="toggle"]',CONVERSATION:"[data-conversation-id]",BLOCKED_ICON_CONTAINER:'[data-region="contact-icon-blocked"]',LAST_MESSAGE:'[data-region="last-message"]',LAST_MESSAGE_DATE:'[data-region="last-message-date"]',UNREAD_COUNT:'[data-region="unread-count"]',SECTION_TOTAL_COUNT:'[data-region="section-total-count"]',SECTION_TOTAL_COUNT_CONTAINER:'[data-region="section-total-count-container"]',SECTION_UNREAD_COUNT:'[data-region="section-unread-count"]',PLACEHOLDER_CONTAINER:'[data-region="placeholder-container"]'},o={CONVERSATIONS_LIST:"core_message/message_drawer_conversations_list",CONVERSATIONS_LIST_ITEMS_PLACEHOLDER:"core_message/message_drawer_conversations_list_items_placeholder"},p=50,q={},r=!1,s=!1,t=function(a){return l.getRoot(a).hasClass("show")},u=function(a){a.addClass("expanded")},v=function(a){a.removeClass("expanded")},w=function(a,b){var c=a.find(n.SECTION_TOTAL_COUNT_CONTAINER),d=c.find(n.SECTION_TOTAL_COUNT);d.text(b),c.removeClass("hidden");var e=b>20?20:b,g=Array.apply(null,Array(e)).map(function(){return!0});f.render(o.CONVERSATIONS_LIST_ITEMS_PLACEHOLDER,{placeholders:g}).then(function(b){var c=a.find(n.PLACEHOLDER_CONTAINER);c.html(b)})["catch"](function(){})},x=function(a,b){var c=a.find(n.SECTION_UNREAD_COUNT);c.text(b),b>0&&c.removeClass("hidden")},y=function(b,d,e){var g=d.map(function(b){var c=b.messages.length?b.messages[b.messages.length-1]:null,d={id:b.id,imageurl:b.imageurl,name:b.name,subname:b.subname,unreadcount:b.unreadcount,lastmessagedate:c?c.timecreated:null,sentfromcurrentuser:c?c.useridfrom==e:null,lastmessage:c?a(c.text).text()||c.text:null};if(b.type==m.CONVERSATION_TYPES.PRIVATE){var f=b.members.reduce(function(a,b){return a||b.id==e||(a=b),a},null);d.userid=f.id,d.showonlinestatus=f.showonlinestatus,d.isonline=f.isonline,d.isblocked=f.isblocked}return b.type==m.CONVERSATION_TYPES.PUBLIC&&(d.lastsendername=b.members.reduce(function(a,b){return a||b.id!=c.useridfrom||(a=b.fullname),a},null)),d});return f.render(o.CONVERSATIONS_LIST,{conversations:g}).then(function(a){return b.append(a),a})["catch"](c.exception)},z=function(a,b,d){return function(e,f){return h.getConversations(f,a,p+1,d,b).then(function(a){var b=a.conversations;return b.length>p?b=b.slice(0,-1):l.setLoadedAll(e,!0),d+=p,b.forEach(function(a){q[a.id]=a}),b})["catch"](c.exception)}},A=function(a){return a.find(n.SECTION_TOTAL_COUNT)},B=function(a){return a.find(n.SECTION_UNREAD_COUNT)},C=function(a){if(r){var b=A(a),c=parseInt(b.text());c+=1,b.text(c)}},D=function(a){if(r){var b=A(a),c=parseInt(b.text());c-=1,b.text(c)}},E=function(a){if(s){var b=B(a),c=parseInt(b.text());c-=1,b.text(c),c<1&&b.addClass("hidden")}},F=function(a,b){return a.find('[data-conversation-id="'+b+'"]')},G=function(a,b){return a.find('[data-user-id="'+b+'"]')},H=function(a){a.find(n.BLOCKED_ICON_CONTAINER).removeClass("hidden")},I=function(a){a.find(n.BLOCKED_ICON_CONTAINER).addClass("hidden")},J=function(b,c){var d=c.messages[c.messages.length-1],f="",h=[{key:"yousender",component:"core_message"},{key:"strftimetime24",component:"core_langconfig"}];return e.get_strings(h).then(function(a){return f=a[0],g.get([{timestamp:d.timeCreated,format:a[1]}])}).then(function(a){return a[0]}).then(function(c){return b.find(n.LAST_MESSAGE_DATE).text(c).removeClass("hidden"),e.get_string("conversationlastmessage","core_message",{sender:d.fromLoggedInUser?f:d.userFrom.fullname,message:"<span class='text-muted'>"+a(d.text).text()+"</span>"})}).then(function(a){return b.find(n.LAST_MESSAGE).html(a)})},K=function(b,d){var e=b.find(n.CONVERSATION),g="";if(!e.length){var h=l.getRoot(b);l.showContent(h),l.hideEmptyMessage(h)}var i=d.messages.length,j=i?d.messages[i-1]:null;j&&(g=a(j.text).text()||j.text);var k={id:d.id,name:d.name,subname:d.subname,lastmessagedate:j?j.timeCreated:null,sentfromcurrentuser:j?j.fromLoggedInUser:null,lastmessage:g,imageurl:d.imageUrl};return q[d.id]=d,f.render(o.CONVERSATIONS_LIST,{conversations:[k]}).then(function(a){var c=l.getContentContainer(b);return c.prepend(a)}).then(function(){return C(b)})["catch"](c.exception)},L=function(a,b){b.remove(),D(a);var c=a.find(n.CONVERSATION);if(!c.length){var d=l.getRoot(a);l.hideContent(d),l.showEmptyMessage(d)}},M=function(a,b){var c=b.find(n.UNREAD_COUNT);c.text("0"),c.addClass("hidden"),E(a)},N=function(c,e,f,g){var h=l.getRoot(c),m=c.find(n.TOGGLE);c.css("min-height",m.outerHeight()),c.on("show.bs.collapse",function(){u(c),l.show(h,e,y)}),c.on("hidden.bs.collapse",function(){v(c)}),d.subscribe(i.CONTACT_BLOCKED,function(a){var b=G(c,a);b.length&&H(b)}),d.subscribe(i.CONTACT_UNBLOCKED,function(a){var b=G(c,a);b.length&&I(b)}),d.subscribe(i.CONVERSATION_NEW_LAST_MESSAGE,function(a){if(!(f&&a.type!=f||g&&!a.isFavourite||!g&&a.isFavourite)){var b=a.id,d=F(c,b);d.length?J(d,a):K(c,a)}}),d.subscribe(i.CONVERSATION_DELETED,function(a){var b=F(c,a);b.length&&L(c,b)}),d.subscribe(i.CONVERSATION_READ,function(a){var b=F(c,a);b.length&&M(c,b)}),d.subscribe(i.CONVERSATION_SET_FAVOURITE,function(a){var b=null;!g||f&&f!=a.type?f==a.type&&(b=F(c,a.id),b.length&&L(c,b)):(b=F(c,a.id),b.length||K(c,a))}),d.subscribe(i.CONVERSATION_UNSET_FAVOURITE,function(a){var b=null;g?(b=F(c,a.id),b.length&&L(c,b)):f==a.type&&(b=F(c,a.id),b.length||K(c,a))}),b.define(c,[b.events.activate]),c.on(b.events.activate,n.CONVERSATION,function(b,c){var d=a(b.target).closest(n.CONVERSATION),e=d.attr("data-conversation-id"),f=q[e];j.go(k.VIEW_CONVERSATION,f),c.originalEvent.preventDefault()})},O=function(b,c,d,e,f){if(b=a(b),!b.attr("data-init")){var g=z(c,d,0);if(N(b,g,c,d),t(b)){u(b);var h=l.getRoot(b);l.show(h,g,y)}e.then(function(a){w(b,a),r=!0})["catch"](function(){}),f.then(function(a){x(b,a),r=!0})["catch"](function(){}),b.attr("data-init",!0)}};return{show:O,isVisible:t}});
\ No newline at end of file
diff --git a/message/amd/src/message_drawer_view_overview_section.js b/message/amd/src/message_drawer_view_overview_section.js
index c19b82cfdb1..5489219afe5 100644
--- a/message/amd/src/message_drawer_view_overview_section.js
+++ b/message/amd/src/message_drawer_view_overview_section.js
@@ -194,7 +194,7 @@ function(
                         carry = member.fullname;
                     }
                     return carry;
-                }, null) + ':';
+                }, null);
             }
 
             return formattedConversation;
@@ -363,7 +363,7 @@ function(
         var message = conversation.messages[conversation.messages.length - 1];
         var youString = '';
         var stringRequests = [
-            {key: 'you', component: 'core_message'},
+            {key: 'yousender', component: 'core_message'},
             {key: 'strftimetime24', component: 'core_langconfig'},
         ];
         return Str.get_strings(stringRequests)
@@ -375,17 +375,16 @@ function(
                 return dates[0];
             })
             .then(function(dateString) {
-                var lastMessage = $(message.text).text();
-
-                if (message.fromLoggedInUser) {
-                    lastMessage = youString + ' ' + lastMessage;
-                } else {
-                    lastMessage = message.userFrom.fullname + ': ' + lastMessage;
-                }
-
-                element.find(SELECTORS.LAST_MESSAGE).html(lastMessage);
                 element.find(SELECTORS.LAST_MESSAGE_DATE).text(dateString).removeClass('hidden');
-                return dateString;
+
+                // Now load the last message.
+                return Str.get_string('conversationlastmessage', 'core_message', {
+                    sender: message.fromLoggedInUser ? youString : message.userFrom.fullname,
+                    message: "<span class='text-muted'>" + $(message.text).text() + "</span>"
+                });
+            })
+            .then(function(lastMessage) {
+                return element.find(SELECTORS.LAST_MESSAGE).html(lastMessage);
             });
     };
 
diff --git a/message/templates/message_drawer_conversations_list.mustache b/message/templates/message_drawer_conversations_list.mustache
index 24b14bb71cd..10327b634f1 100644
--- a/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@ -66,16 +66,34 @@
                 <p class="m-0 text-truncate">{{.}}</p>
             {{/subname}}
             <p class="m-0 font-weight-light text-truncate" data-region="last-message">
-                {{#sentfromcurrentuser}}{{#str}} you, core_message {{/str}}{{/sentfromcurrentuser}}
-                {{^sentfromcurrentuser}}{{lastsendername}}{{/sentfromcurrentuser}}
-                <span class="text-muted">{{lastmessage}}</span>
+                {{#sentfromcurrentuser}}
+                    {{#str}}
+                        conversationlastmessage,
+                        core_message,
+                        {
+                            "sender": "{{#str}} yousender, core_message {{/str}}",
+                            "message": "<span class='text-muted'>{{lastmessage}}</span>"
+                        }
+                    {{/str}}
+                {{/sentfromcurrentuser}}
+                {{^sentfromcurrentuser}}
+                    {{#lastsendername}}
+                        {{#str}}
+                            conversationlastmessage,
+                            core_message,
+                            {
+                                "sender": "{{.}}",
+                                "message": "<span class='text-muted'>{{lastmessage}}</span>"
+                            }
+                        {{/str}}
+                    {{/lastsendername}}
+                {{/sentfromcurrentuser}}
             </p>
         </div>
         <div class="d-flex align-self-stretch">
             <div
-                class="ml-auto small position-absolute text-muted {{^lastmessagedate}}hidden{{/lastmessagedate}}"
+                class="px-2 py-1 small position-absolute position-right text-muted {{^lastmessagedate}}hidden{{/lastmessagedate}}"
                 data-region="last-message-date"
-                style="right: 0.5rem"
             >
                 {{#lastmessagedate}}
                     {{#userdate}} {{.}}, {{#str}} strftimetime24, core_langconfig  {{/str}} {{/userdate}}
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 6b887668ed9..8f5c2e7b317 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2248,4 +2248,8 @@ $switch-transition: .2s all !default;
 
 .text-decoration-none {
     text-decoration: none !important; /* stylelint-disable-line declaration-no-important */
+}
+
+.position-right {
+    right: 0 !important; /* stylelint-disable-line declaration-no-important */
 }
\ No newline at end of file
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index feff2f274df..674bae50cb1 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -10532,6 +10532,10 @@ div.editor_atto_toolbar button .icon {
   text-decoration: none !important;
   /* stylelint-disable-line declaration-no-important */ }
 
+.position-right {
+  right: 0 !important;
+  /* stylelint-disable-line declaration-no-important */ }
+
 .icon {
   font-size: 16px;
   width: 16px;
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
index d4a8acbadbe..a712881a1e8 100644
--- a/theme/bootstrapbase/less/moodle/core.less
+++ b/theme/bootstrapbase/less/moodle/core.less
@@ -2446,4 +2446,8 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
 
 .text-decoration-none {
     text-decoration: none !important; /* stylelint-disable-line declaration-no-important */
+}
+
+.position-right {
+    right: 0 !important; /* stylelint-disable-line declaration-no-important */
 }
\ No newline at end of file
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 03dcfb7fdb3..4497f698b64 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -4827,6 +4827,10 @@ h3.sectionname .inplaceeditable.inplaceeditingon .editinstructions {
   text-decoration: none !important;
   /* stylelint-disable-line declaration-no-important */
 }
+.position-right {
+  right: 0 !important;
+  /* stylelint-disable-line declaration-no-important */
+}
 /* admin.less */
 .formtable tbody th {
   font-weight: normal;