diff --git a/public/message/templates/message_drawer_view_overview_header.mustache b/public/message/templates/message_drawer_view_overview_header.mustache
index 8a8dfede24c..ea6f24a0dfc 100644
--- a/public/message/templates/message_drawer_view_overview_header.mustache
+++ b/public/message/templates/message_drawer_view_overview_header.mustache
@@ -35,7 +35,8 @@
 }}
 <div class="border-bottom p-1 px-sm-2" aria-hidden="false" {{^isdrawer}}data-in-panel="true"{{/isdrawer}} data-region="view-overview">
     <div class="d-flex align-items-center">
-        <div class="input-group simplesearchform">
+        <div class="input-group simplesearchform" role="group" aria-labelledby="messageoverviewgrouplabel">
+            <span class="visually-hidden" id="messageoverviewgrouplabel">{{#str}}searchcombined, message{{/str}}</span>
             <input
                 type="text"
                 class="form-control"
diff --git a/public/message/templates/message_drawer_view_search_header.mustache b/public/message/templates/message_drawer_view_search_header.mustache
index 40071f33a61..8b6657cd934 100644
--- a/public/message/templates/message_drawer_view_search_header.mustache
+++ b/public/message/templates/message_drawer_view_search_header.mustache
@@ -45,7 +45,8 @@
         >
             {{> core_message/message_drawer_icon_back }}
         </a>
-        <div class="input-group simplesearchform">
+        <div class="input-group simplesearchform" role="group" aria-labelledby="messagesearchgrouplabel">
+            <span class="visually-hidden" id="messagesearchgrouplabel">{{#str}}searchcombined, message{{/str}}</span>
             <input
                 type="text"
                 class="form-control"
@@ -57,7 +58,8 @@
                 class="btn btn-submit icon-no-margin"
                 type="button"
                 data-action="search"
-                aria-label="{{#str}} search, core_search {{/str}}"
+                aria-label="{{#str}} performsearch, core_search {{/str}}"
+                title="{{#str}} performsearch, core_search {{/str}}"
             >
                 <span data-region="search-icon-container">
                     {{#pix}} a/search, core {{/pix}}
@@ -68,4 +70,4 @@
             </button>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>