diff --git a/message/templates/message_area_profile.mustache b/message/templates/message_area_profile.mustache
index f11f4442a55..d76b25980a2 100644
--- a/message/templates/message_area_profile.mustache
+++ b/message/templates/message_area_profile.mustache
@@ -8,18 +8,11 @@
                 <div class="offline-text">{{#str}} offline, message {{/str}}</div>
             </div>
         </div>
-        <div class="information">
-            <div class="names">
-                <div>{{#str}} email {{/str}}</div>
-                <div>{{#str}} country {{/str}}</div>
-                <div>{{#str}} city {{/str}}</div>
-            </div>
-            <div class="values">
-                <div>{{email}}</div>
-                <div>{{country}}</div>
-                <div>{{city}}</div>
-            </div>
-        </div>
+        <ul class="information">
+            {{#email}}<li><div class="name">{{#str}} email {{/str}}</div><div class="value">{{.}}</div></li>{{/email}}
+            {{#country}}<li><div class="name">{{#str}} country {{/str}}</div><div class="value">{{country}}</div></li>{{/country}}
+            {{#city}}<li><div class="name">{{#str}} city {{/str}}</div><div class="value">{{city}}</div></li>{{/city}}
+        </ul>
     </div>
     <div class="actions">
         <div class="separator">
diff --git a/theme/bootstrapbase/less/moodle/message.less b/theme/bootstrapbase/less/moodle/message.less
index b31fe9bcd2f..f794f342e34 100644
--- a/theme/bootstrapbase/less/moodle/message.less
+++ b/theme/bootstrapbase/less/moodle/message.less
@@ -312,15 +312,16 @@
                     float: right;
                     margin-top: 20px;
                     font-size: 14px;
+                    list-style: none;
 
-                    .names {
+                    .name {
                         display: inline-block;
                         font-weight: bold;
                         text-align: right;
                         margin-right: 10px;
                     }
 
-                    .values {
+                    .value {
                         display: inline-block;
                     }
                 }
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index af1956a7ae8..99cc01f7833 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -6021,14 +6021,15 @@ a.ygtvspacer:hover {
   float: right;
   margin-top: 20px;
   font-size: 14px;
+  list-style: none;
 }
-.messaging-area-container .messaging-area .messages-area .profile .information .names {
+.messaging-area-container .messaging-area .messages-area .profile .information .name {
   display: inline-block;
   font-weight: bold;
   text-align: right;
   margin-right: 10px;
 }
-.messaging-area-container .messaging-area .messages-area .profile .information .values {
+.messaging-area-container .messaging-area .messages-area .profile .information .value {
   display: inline-block;
 }
 .messaging-area-container .messaging-area .messages-area .profile .actions {