diff --git a/plugins/messages/contacts.html b/plugins/messages/contacts.html
index db728edfd..00d8d88f1 100644
--- a/plugins/messages/contacts.html
+++ b/plugins/messages/contacts.html
@@ -17,7 +17,6 @@
             <% var types = ["online", "offline", "strangers"]; %>
             <% var displayed = []; %>
             <% types.forEach(function(type) { %>
-            <% if (!contacts[type].length) return; %>
             <h3>
                 <% if (type == "online") { %>
                     <%= MM.lang.s("onlinecontacts", "core", contacts[type].length) %>
diff --git a/plugins/messages/recent.html b/plugins/messages/recent.html
index 5a4d44142..e588fd80b 100644
--- a/plugins/messages/recent.html
+++ b/plugins/messages/recent.html
@@ -2,8 +2,8 @@
     <a href="#messages/contacts"><img src="img/ico-contacts.png"></a>
 </script>
 <div class="panel-container">
+    <% if (messages.length > 0) {%>
     <div class="path-messages recent-messages">
-        <% if (messages.length > 0) {%>
         <ul class="nav nav-v">
             <% _.each(messages, function(message) { %>
             <% if (message.user != MM.config.current_site.userid) { %>
@@ -32,8 +32,12 @@
             <% } %>
             <% }); %>
         </ul>
-        <% } else { %>
-        <h3><strong><%= MM.lang.s("nomessagesfound") %></strong></h3>
-        <% } %>
     </div>
+    <% } else { %>
+    <div class="messages">
+        <div class="no-content">
+            <p><%= MM.lang.s("nomessagesfound") %></p>
+        </div>
+    </div>
+    <% } %>
 </div>