diff --git a/message/templates/message_area_contact.mustache b/message/templates/message_area_contact.mustache
index 9cd99c90afa..3ec2b7ab7ba 100644
--- a/message/templates/message_area_contact.mustache
+++ b/message/templates/message_area_contact.mustache
@@ -5,7 +5,7 @@
         <img src="{{profileimageurl}}" alt="" />
     </div>
     <div class="span9 information">
-        <div class="name">{{fullname}} {{#isonline}}*{{/isonline}}</div>
+        <div class="name">{{fullname}} {{#isonline}}{{#pix}} t/go, core, {{#str}} online, message {{/str}} {{/pix}}{{/isonline}}</div>
         <p class="lastmessage" data-region="lastmessage">
             {{#lastmessage}}
                 {{.}}
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index b6f43e64446..9900616077d 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -184,6 +184,10 @@
 
                         .name {
                             font-weight: bold;
+
+                            img {
+                                vertical-align: baseline;
+                            }
                         }
 
                         .lastmessage {
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 4049ee3e308..f17527d8e74 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -5918,6 +5918,9 @@ a.ygtvspacer:hover {
 .messaging-area-container .messaging-area .contacts-area .contacts .contact .information .name {
   font-weight: bold;
 }
+.messaging-area-container .messaging-area .contacts-area .contacts .contact .information .name img {
+  vertical-align: baseline;
+}
 .messaging-area-container .messaging-area .contacts-area .contacts .contact .information .lastmessage {
   word-wrap: break-word;
   margin: 0;