diff --git a/lang/en/message.php b/lang/en/message.php
index 10c83e83de2..5594c8ccd57 100644
--- a/lang/en/message.php
+++ b/lang/en/message.php
@@ -80,6 +80,7 @@ $string['maxmessages'] = 'Maximum number of messages to show in the discussion h
 $string['message'] = 'Message';
 $string['messagehistory'] = 'Message history';
 $string['messagehistoryfull'] = 'All messages';
+$string['messagenavigation'] = 'Message navigation:';
 $string['messages'] = 'Messages';
 $string['messaging'] = 'Messaging';
 $string['messagingblockednoncontact'] = '{$a} will not be able to reply as you have blocked non-contacts';
diff --git a/message/lib.php b/message/lib.php
index 4703d1a4091..5de03bd2b07 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -507,9 +507,10 @@ function message_print_usergroup_selector($viewing, $courses, $coursecontexts, $
     }
 
     echo html_writer::start_tag('form', array('id' => 'usergroupform','method' => 'get','action' => ''));
-        echo html_writer::start_tag('fieldset');
-            echo html_writer::select($options, 'viewing', $viewing, false, array('id' => 'viewing','onchange' => 'this.form.submit()'));
-        echo html_writer::end_tag('fieldset');
+    echo html_writer::start_tag('fieldset');
+    echo html_writer::label(get_string('messagenavigation', 'message'), 'viewing');
+    echo html_writer::select($options, 'viewing', $viewing, false, array('id' => 'viewing','onchange' => 'this.form.submit()'));
+    echo html_writer::end_tag('fieldset');
     echo html_writer::end_tag('form');
 }
 
diff --git a/message/search.html b/message/search.html
index 7adedc29f15..b396135b1dd 100644
--- a/message/search.html
+++ b/message/search.html
@@ -4,6 +4,7 @@
     <tr>
         <td colspan="3" class="message_heading mdl-left">
             <input type="hidden" name="sesskey" value="<?php p(sesskey()); ?>" />
+            <label for="combinedsearch" class="accesshide"><?php print_string('searchcombined', 'message'); ?></label>
             <input type="text" name="combinedsearch" size="40" id="combinedsearch" value="<?php p($combinedsearchstring); ?>" />
             <input type="submit" name="combinedsubmit" value="<?php print_string('searchcombined','message') ?>" />
             <a href="index.php?usergroup=<?php echo MESSAGE_VIEW_SEARCH ?>&advanced=1" id="advancedcontactsearchlink"><?php print_string('advanced') ?></a>