Merge branch 'new-messaging' into staging

www/contacts/main.less

@@ -52,6 +52,7 @@ body {
     width: 350px;
     height: 100%;
     background-color: lighten(@bg-color, 10%);
+    overflow-y: auto;
     .friend {
         background: rgba(0,0,0,0.1);
         padding: 5px;
@@ -169,8 +170,8 @@ body {
             margin: 10px;
         }
         .more-history {
-            display: none;
-            //.hover;
+            //display: none;
+            .hover;
         }
     }
     .chat {