diff --git a/src/widgets/room/roomwidget.cpp b/src/widgets/room/roomwidget.cpp
index c1e9e405..650d9480 100644
--- a/src/widgets/room/roomwidget.cpp
+++ b/src/widgets/room/roomwidget.cpp
@@ -1,319 +1,318 @@
 /*
    Copyright (c) 2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "roomwidget.h"
 #include "roomheaderwidget.h"
 #include "messagelistview.h"
 #include "messagelinewidget.h"
 #include "ruqola.h"
 #include "rocketchataccount.h"
 #include "roomwrapper.h"
 #include "readonlylineeditwidget.h"
 #include "messagetextedit.h"
 #include "ruqolawidgets_debug.h"
 #include "usersinroomflowwidget.h"
 #include "model/roommodel.h"
 #include "dialogs/createnewdiscussiondialog.h"
 
 #include <QVBoxLayout>
 #include <QKeyEvent>
 #include <QStackedWidget>
 #include <QMimeData>
 #include <QPointer>
 #include <QScrollBar>
 
 RoomWidget::RoomWidget(QWidget *parent)
     : QWidget(parent)
 {
     auto *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     mainLayout->setContentsMargins(0, 0, 0, 0);
 
     mRoomHeaderWidget = new RoomHeaderWidget(this);
     mRoomHeaderWidget->setObjectName(QStringLiteral("mRoomHeaderWidget"));
     mainLayout->addWidget(mRoomHeaderWidget);
 
-//    mUsersInRoomFlowWidget = new UsersInRoomFlowWidget(this);
-//    mUsersInRoomFlowWidget->setObjectName(QStringLiteral("mUsersInRoomFlowWidget"));
-//    mainLayout->addWidget(mUsersInRoomFlowWidget);
-//    mUsersInRoomFlowWidget->setVisible(false);
+    mUsersInRoomFlowWidget = new UsersInRoomFlowWidget(this);
+    mUsersInRoomFlowWidget->setObjectName(QStringLiteral("mUsersInRoomFlowWidget"));
+    mainLayout->addWidget(mUsersInRoomFlowWidget);
+    mUsersInRoomFlowWidget->setVisible(false);
 
     mMessageListView = new MessageListView(this);
     mMessageListView->setObjectName(QStringLiteral("mMessageListView"));
     mainLayout->addWidget(mMessageListView, 1);
 
     mStackedWidget = new QStackedWidget(this);
     mStackedWidget->setObjectName(QStringLiteral("mStackedWidget"));
     mainLayout->addWidget(mStackedWidget);
 
     mMessageLineWidget = new MessageLineWidget(this);
     mMessageLineWidget->setObjectName(QStringLiteral("mMessageLineWidget"));
     mStackedWidget->addWidget(mMessageLineWidget);
 
     mReadOnlyLineEditWidget = new ReadOnlyLineEditWidget(this);
     mReadOnlyLineEditWidget->setObjectName(QStringLiteral("mReadOnlyLineEditWidget"));
     mStackedWidget->addWidget(mReadOnlyLineEditWidget);
 
     mStackedWidget->setCurrentWidget(mMessageLineWidget);
 
     connect(this, &RoomWidget::channelSelected, this, &RoomWidget::setChannelSelected);
     connect(mMessageLineWidget, &MessageLineWidget::sendMessage, this, &RoomWidget::slotSendMessage);
     connect(mMessageLineWidget, &MessageLineWidget::sendFile, this, &RoomWidget::slotSendFile);
     connect(mMessageLineWidget, &MessageLineWidget::textEditing, this, &RoomWidget::slotTextEditing);
     connect(mMessageLineWidget->messageTextEdit(), &MessageTextEdit::keyPressed, this, &RoomWidget::keyPressedInLineEdit);
     connect(mRoomHeaderWidget, &RoomHeaderWidget::favoriteChanged, this, &RoomWidget::slotChangeFavorite);
     connect(mRoomHeaderWidget, &RoomHeaderWidget::encryptedChanged, this, &RoomWidget::slotEncryptedChanged);
     connect(mRoomHeaderWidget, &RoomHeaderWidget::goBackToRoom, this, &RoomWidget::slotGoBackToRoom);
 
     connect(mMessageListView, &MessageListView::editMessageRequested, this, &RoomWidget::slotEditMessage);
     connect(mMessageListView, &MessageListView::createNewDiscussion, this, &RoomWidget::slotCreateNewDiscussion);
 
     setAcceptDrops(true);
 }
 
 RoomWidget::~RoomWidget()
 {
     delete mRoomWrapper;
 }
 
 void RoomWidget::slotCreateNewDiscussion(const QString &messageId, const QString &originalMessage)
 {
     QPointer<CreateNewDiscussionDialog> dlg = new CreateNewDiscussionDialog(this);
     dlg->setDiscussionName(originalMessage);
     dlg->setChannelName(mRoomHeaderWidget->roomName());
     if (dlg->exec()) {
         auto *rcAccount = Ruqola::self()->rocketChatAccount();
         const CreateNewDiscussionDialog::NewDiscussionInfo info = dlg->newDiscussionInfo();
         rcAccount->createDiscussion(mRoomId, info.discussionName, info.message, messageId, info.users);
     }
     delete dlg;
 }
 
 void RoomWidget::slotTextEditing(bool clearNotification)
 {
     mCurrentRocketChatAccount->textEditing(mRoomId, clearNotification);
 }
 
 void RoomWidget::slotSendFile(const UploadFileDialog::UploadFileInfo &uploadFileInfo)
 {
     mCurrentRocketChatAccount->uploadFile(mRoomId, uploadFileInfo.description, QString(), uploadFileInfo.fileUrl);
 }
 
 void RoomWidget::slotSendMessage(const QString &msg)
 {
     if (mMessageIdBeingEdited.isEmpty()) {
         mCurrentRocketChatAccount->sendMessage(mRoomId, msg);
     } else {
         mCurrentRocketChatAccount->updateMessage(mRoomId, mMessageIdBeingEdited, msg);
         mMessageIdBeingEdited.clear();
     }
     mMessageLineWidget->setMode(MessageLineWidget::EditingMode::NewMessage);
 }
 
 void RoomWidget::slotEditMessage(const QString &messageId, const QString &text)
 {
     mMessageIdBeingEdited = messageId;
     mMessageLineWidget->setMode(MessageLineWidget::EditingMode::EditMessage);
     mMessageLineWidget->setText(text);
     mMessageLineWidget->setFocus();
 }
 
 void RoomWidget::dragEnterEvent(QDragEnterEvent *event)
 {
     const QMimeData *mimeData = event->mimeData();
     if (mimeData->hasUrls()) {
         event->accept();
     }
 }
 
 void RoomWidget::dropEvent(QDropEvent *event)
 {
     const QMimeData *mimeData = event->mimeData();
     if (mimeData->hasUrls()) {
         const QList<QUrl> urls = mimeData->urls();
         for (const QUrl &url : urls) {
             if (url.isLocalFile()) {
                 QPointer<UploadFileDialog> dlg = new UploadFileDialog(this);
                 dlg->setFileUrl(url);
                 if (dlg->exec()) {
                     const UploadFileDialog::UploadFileInfo uploadFileInfo = dlg->fileInfo();
                     slotSendFile(uploadFileInfo);
                 }
             }
         }
     }
 }
 
 void RoomWidget::setChannelSelected(const QModelIndex &index)
 {
 
     if (mMessageLineWidget->text().isEmpty()) {
         auto *vbar = mMessageListView->verticalScrollBar();
         if (vbar->value() != vbar->maximum()) {
             AccountRoomSettings::PendingTypedInfo info;
             info.scrollbarPosition = mMessageListView->verticalScrollBar()->value();
             mCurrentRocketChatAccount->accountRoomSettings()->add(mRoomId, info);
         } else {
             mCurrentRocketChatAccount->accountRoomSettings()->remove(mRoomId);
         }
     } else {
         AccountRoomSettings::PendingTypedInfo info;
         info.text = mMessageLineWidget->text();
         info.messageIdBeingEdited = mMessageIdBeingEdited;
         info.scrollbarPosition = mMessageListView->verticalScrollBar()->value();
         mCurrentRocketChatAccount->accountRoomSettings()->add(mRoomId, info);
     }
 
     const QString roomId = index.data(RoomModel::RoomID).toString();
     setRoomId(roomId);
     setRoomType(index.data(RoomModel::RoomType).toString());
     const AccountRoomSettings::PendingTypedInfo currentPendingInfo = mCurrentRocketChatAccount->accountRoomSettings()->value(roomId);
     if (currentPendingInfo.isValid()) {
         mMessageLineWidget->setText(currentPendingInfo.text);
         mMessageIdBeingEdited = currentPendingInfo.messageIdBeingEdited;
         if (currentPendingInfo.scrollbarPosition != -1) {
             mMessageListView->verticalScrollBar()->setValue(currentPendingInfo.scrollbarPosition);
         }
     }
     mMessageLineWidget->setMode(mMessageIdBeingEdited.isEmpty() ? MessageLineWidget::EditingMode::NewMessage : MessageLineWidget::EditingMode::EditMessage);
 
     mMessageLineWidget->setFocus();
 }
 
 void RoomWidget::updateRoomHeader()
 {
     if (mRoomWrapper) {
         mRoomHeaderWidget->setRoomName(mRoomWrapper->displayRoomName());
         mRoomHeaderWidget->setRoomAnnouncement(mRoomWrapper->announcement());
         mRoomHeaderWidget->setRoomTopic(mRoomWrapper->topic());
         mRoomHeaderWidget->setFavoriteStatus(mRoomWrapper->favorite());
         mRoomHeaderWidget->setEncypted(mRoomWrapper->encrypted());
         mRoomHeaderWidget->setIsDiscussion(mRoomWrapper->isDiscussionRoom());
         //TODO Description ?
 
         if (mRoomWrapper->roomMessageInfo().isEmpty()) {
             mStackedWidget->setCurrentWidget(mMessageLineWidget);
         } else {
             mStackedWidget->setCurrentWidget(mReadOnlyLineEditWidget);
             mReadOnlyLineEditWidget->setMessage(mRoomWrapper->roomMessageInfo());
         }
     }
 }
 
 QString RoomWidget::roomId() const
 {
     return mRoomId;
 }
 
 void RoomWidget::setRoomType(const QString &roomType)
 {
     mRoomType = roomType;
 }
 
 RoomWrapper *RoomWidget::roomWrapper() const
 {
     return mRoomWrapper;
 }
 
 void RoomWidget::showListOfUsersInRoom(bool checked)
 {
-    //Disable for the moment
-    //mUsersInRoomFlowWidget->setVisible(checked);
+    mUsersInRoomFlowWidget->setVisible(checked);
 }
 
 void RoomWidget::setRoomId(const QString &roomId)
 {
     mRoomId = roomId;
     delete mRoomWrapper;
     mRoomWrapper = mCurrentRocketChatAccount->roomWrapper(mRoomId);
     connectRoomWrapper();
     mMessageListView->setChannelSelected(roomId);
-    //mUsersInRoomFlowWidget->setRoomId(roomId);
+    mUsersInRoomFlowWidget->setRoomId(roomId);
 }
 
 void RoomWidget::connectRoomWrapper()
 {
     if (mRoomWrapper) {
         connect(mRoomWrapper, &RoomWrapper::announcementChanged, this, [this]() {
             mRoomHeaderWidget->setRoomAnnouncement(mRoomWrapper->announcement());
         });
         connect(mRoomWrapper, &RoomWrapper::topicChanged, this, [this]() {
             mRoomHeaderWidget->setRoomTopic(mRoomWrapper->topic());
         });
         connect(mRoomWrapper, &RoomWrapper::nameChanged, this, [this]() {
             mRoomHeaderWidget->setRoomName(mRoomWrapper->displayRoomName());
         });
         connect(mRoomWrapper, &RoomWrapper::favoriteChanged, this, [this]() {
             mRoomHeaderWidget->setFavoriteStatus(mRoomWrapper->favorite());
         });
         connect(mRoomWrapper, &RoomWrapper::encryptedChanged, this, [this]() {
             mRoomHeaderWidget->setEncypted(mRoomWrapper->encrypted());
         });
     }
     updateRoomHeader();
 }
 
 void RoomWidget::slotClearNotification()
 {
     mCurrentRocketChatAccount->clearUnreadMessages(mRoomId);
 }
 
 void RoomWidget::slotEncryptedChanged(bool b)
 {
     qCWarning(RUQOLAWIDGETS_LOG) << "change encrypted not supported yet";
     //TODO mCurrentRocketChatAccount->slot
 }
 
 void RoomWidget::slotChangeFavorite(bool b)
 {
     mCurrentRocketChatAccount->changeFavorite(mRoomId, b);
 }
 
 void RoomWidget::keyPressedInLineEdit(QKeyEvent *ev)
 {
     if (ev->key() == Qt::Key_Escape) {
         if (!mMessageIdBeingEdited.isEmpty()) {
             mMessageIdBeingEdited.clear();
             mMessageLineWidget->setText(QString());
         } else {
             slotClearNotification();
         }
         ev->accept();
     } else {
         mMessageListView->handleKeyPressEvent(ev);
     }
 }
 
 QString RoomWidget::roomType() const
 {
     return mRoomType;
 }
 
 void RoomWidget::setCurrentRocketChatAccount(RocketChatAccount *account)
 {
     mCurrentRocketChatAccount = account;
     mMessageLineWidget->setCurrentRocketChatAccount(account);
     mRoomId.clear(); //Clear it otherwise if we switch between two account with same roomId (as "GENERAL") we will see incorrect room.
 }
 
 void RoomWidget::slotGoBackToRoom()
 {
     Q_EMIT selectChannelRequested(mRoomWrapper->parentRid());
 }
diff --git a/src/widgets/room/usersinroomflowwidget.cpp b/src/widgets/room/usersinroomflowwidget.cpp
index bbd19e09..41c9b8ee 100644
--- a/src/widgets/room/usersinroomflowwidget.cpp
+++ b/src/widgets/room/usersinroomflowwidget.cpp
@@ -1,67 +1,70 @@
 /*
    Copyright (c) 2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "usersinroomflowwidget.h"
 #include "usersinroomlabel.h"
 #include "ruqola.h"
 #include "rocketchataccount.h"
 #include "common/flowlayout.h"
 #include "model/usersforroommodel.h"
 #include "model/usersforroomfilterproxymodel.h"
 #include <KLocalizedString>
 #include <QLabel>
 
 UsersInRoomFlowWidget::UsersInRoomFlowWidget(QWidget *parent)
     : QWidget(parent)
 {
     mFlowLayout = new FlowLayout(this);
+    mFlowLayout->setObjectName(QStringLiteral("mFlowLayout"));
+    mFlowLayout->setSpacing(0);
+    mFlowLayout->setContentsMargins(0, 0, 0, 0);
 }
 
 UsersInRoomFlowWidget::~UsersInRoomFlowWidget()
 {
 
 }
 
 void UsersInRoomFlowWidget::setRoomId(const QString &roomId)
 {
     if (mRoomId != roomId) {
         mRoomId = roomId;
         updateList();
     }
 }
 
 void UsersInRoomFlowWidget::updateList()
 {
     if (/*isVisible()*/1) {
         const auto model = Ruqola::self()->rocketChatAccount()->usersForRoomFilterProxyModel(mRoomId);
         const auto count = model->rowCount();
         mFlowLayout->clearAndDeleteWidgets();
         for (int i = 0; i < count; ++i) {
             const auto roomModelIndex = model->index(i, 0);
             const auto userName = roomModelIndex.data(UsersForRoomModel::UsersForRoomRoles::UserName).toString();
             UsersInRoomLabel *userLabel = new UsersInRoomLabel(this);
             userLabel->setUserName(userName);
             mFlowLayout->addWidget(userLabel);
         }
         if (!model->hasFullList()) {
             mFlowLayout->addWidget(new QLabel(i18n("(load More elements)")));
         }
     }
 }
diff --git a/src/widgets/room/usersinroomlabel.cpp b/src/widgets/room/usersinroomlabel.cpp
index 3ed75591..1f98f297 100644
--- a/src/widgets/room/usersinroomlabel.cpp
+++ b/src/widgets/room/usersinroomlabel.cpp
@@ -1,49 +1,50 @@
 /*
    Copyright (c) 2020 Laurent Montel <montel@kde.org>
 
    This library is free software; you can redistribute it and/or modify
    it under the terms of the GNU Library General Public License as published
    by the Free Software Foundation; either version 2 of the License or
    ( at your option ) version 3 or, at the discretion of KDE e.V.
    ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 
 #include "usersinroomlabel.h"
 #include <QHBoxLayout>
 #include <QLabel>
 
 UsersInRoomLabel::UsersInRoomLabel(QWidget *parent)
     : QWidget(parent)
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
     mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->setSpacing(0);
     mIconLabel = new QLabel(this);
     mIconLabel->setObjectName(QStringLiteral("mIconLabel"));
     mainLayout->addWidget(mIconLabel);
 
     mUserNameLabel = new QLabel(this);
     mUserNameLabel->setObjectName(QStringLiteral("mUserNameLabel"));
     mainLayout->addWidget(mUserNameLabel);
 }
 
 UsersInRoomLabel::~UsersInRoomLabel()
 {
 
 }
 
 void UsersInRoomLabel::setUserName(const QString &userName)
 {
     mUserNameLabel->setText(userName);
 }