Merge branch 'MDL-65127-master' of git://github.com/sarjona/moodle

diff --cc message/amd/build/message_drawer_view_overview_section.min.js
index 53f917f,ce8cd4d..42e5adf
Binary files differ

diff --cc message/amd/src/message_drawer_view_overview_section.js
Simple merge

diff --cc message/templates/message_drawer_conversations_list.mustache
index 7dac4da,e07ee3a..9b32273
--- 1/message/templates/message_drawer_conversations_list.mustache
--- 2/message/templates/message_drawer_conversations_list.mustache
+++ b/message/templates/message_drawer_conversations_list.mustache
@@@ -84,16 -83,10 +84,16 @@@
          <div class="d-flex align-self-stretch">
              <div
                  class="px-2 py-1 small position-absolute position-right text-muted {{^lastmessagedate}}hidden{{/lastmessagedate}}"
-                 data-region="last-message-date"
+                 data-region="last-message-date" aria-hidden="true"
              >
                  {{#lastmessagedate}}
 -                    {{#userdate}} {{.}}, {{#str}} strftimetime24, core_langconfig  {{/str}} {{/userdate}}
 +                    {{#istoday}}
 +                        {{#userdate}} {{.}}, {{#str}} strftimetime24, core_langconfig  {{/str}} {{/userdate}}
 +                    {{/istoday}}
 +                    {{^istoday}}
 +                        {{#userdate}} {{.}}, {{#str}} strftimedatefullshort, core_langconfig  {{/str}} {{/userdate}}
 +                    {{/istoday}}
 +
                  {{/lastmessagedate}}
              </div>
              <div class="d-flex align-self-center align-items-center">

diff --cc message/templates/message_drawer_view_overview_header.mustache
index 460fcd3,234c8f8..f0546de
--- 1/message/templates/message_drawer_view_overview_header.mustache
--- 2/message/templates/message_drawer_view_overview_header.mustache
+++ b/message/templates/message_drawer_view_overview_header.mustache
@@@ -62,10 -60,12 +62,12 @@@
          </div>
      </div>
      <div class="text-right mt-3">
 -        <a href="#" data-route="view-contacts">
 +        <a href="#" data-route="view-contacts" role="button">
              {{#pix}} i/user, core {{/pix}}
              {{#str}} contacts, core_message {{/str}}
-             <span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}" data-region="contact-request-count">
+             <span class="badge bg-primary ml-2 {{^contactrequestcount}}hidden{{/contactrequestcount}}"
+             data-region="contact-request-count"
+             aria-label="{{#str}} pendingcontactrequests, core_message, {{contactrequestcount}} {{/str}}">
                  {{contactrequestcount}}
              </span>
          </a>

diff --cc message/templates/message_popover.mustache
index e314506,26c7801..72e541a
--- 1/message/templates/message_popover.mustache
--- 2/message/templates/message_popover.mustache
+++ b/message/templates/message_popover.mustache
@@@ -35,11 -35,11 +35,12 @@@
      }
  
  }}
 -<div class="pull-right popover-region collapsed">
 -    <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#">
 +<div class="float-right popover-region collapsed">
 +    <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#"
 +            role="button">
          {{#pix}} t/message, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}
-         <div class="count-container {{^unreadcount}}hidden{{/unreadcount}}" data-region="count-container">{{unreadcount}}</div>
+         <div class="count-container {{^unreadcount}}hidden{{/unreadcount}}" data-region="count-container"
+         aria-label="{{#str}} unreadconversations, core_message, {{unreadcount}} {{/str}}">{{unreadcount}}</div>
      </a>
  </div>