diff --git a/www/common/common-messaging.js b/www/common/common-messaging.js
index 3af6b9d8a..c3e4efbd9 100644
--- a/www/common/common-messaging.js
+++ b/www/common/common-messaging.js
@@ -40,6 +40,7 @@ define([
                 });
             }
         });
+        return $block;
     };
 
     Msg.createOwnedChannel = function (common, channelId, validateKey, owners, cb) {
@@ -86,7 +87,7 @@ define([
         common.changeDisplayName(proxy[common.displayNameKey]);
     };
 
-    var createData = function (common, hash) {
+    var createData = Msg.createData = function (common, hash) {
         var proxy = common.getProxy();
         return {
             channel: hash || common.createChannelId(),
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 1c0809915..04a04401d 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -113,6 +113,10 @@ define([
     // Messaging
     common.addDirectMessageHandler = Messaging.addDirectMessageHandler;
     common.inviteFromUserlist = Messaging.inviteFromUserlist;
+    common.createOwnedChannel = Messaging.createOwnedChannel;
+    common.getFriendList = Messaging.getFriendList;
+    common.getFriendListUI = Messaging.getFriendListUI;
+    common.createData = Messaging.createData;
 
     // Userlist
     common.createUserList = UserList.create;
diff --git a/www/friends/main.js b/www/friends/main.js
index ce883807c..80b037a27 100644
--- a/www/friends/main.js
+++ b/www/friends/main.js
@@ -36,7 +36,8 @@ define([
         };
         var toolbar = APP.toolbar = Toolbar.create(configTb);
         toolbar.$rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
-        
+
+        Cryptpad.getFriendListUI(Cryptpad).appendTo($list);
 
         Cryptpad.removeLoadingScreen();
     };