diff --git a/autotests/rocketchataccounttest.cpp b/autotests/rocketchataccounttest.cpp
index 56d41157..e9e9d147 100644
--- a/autotests/rocketchataccounttest.cpp
+++ b/autotests/rocketchataccounttest.cpp
@@ -1,53 +1,54 @@
 /*
    Copyright (c) 2018-2019 Montel Laurent <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 "rocketchataccounttest.h"
 #include "rocketchataccount.h"
 #include "model/searchmessagefilterproxymodel.h"
 #include "model/searchmessagemodel.h"
 #include <QTest>
 #include <QStandardPaths>
 
 QTEST_GUILESS_MAIN(RocketChatAccountTest)
 
 RocketChatAccountTest::RocketChatAccountTest(QObject *parent)
     : QObject(parent)
 {
     QStandardPaths::setTestModeEnabled(true);
 }
 
 void RocketChatAccountTest::shouldHaveDefaultValue()
 {
     RocketChatAccount w;
     QVERIFY(w.emojiManager());
     QVERIFY(w.roomModel());
     QVERIFY(w.roomFilterProxyModel());
     QVERIFY(w.settings());
     QVERIFY(!w.ruqolaLogger());
     QVERIFY(w.ruqolaServerConfig());
     QVERIFY(w.userCompleterFilterModelProxy());
     QVERIFY(w.loginMethodModel());
     QVERIFY(w.inputCompleterModel());
     QVERIFY(!w.ruqolaLogger());
     QVERIFY(w.searchChannelFilterProxyModel());
     QVERIFY(w.searchMessageModel());
     QCOMPARE(w.searchMessageFilterProxyModel()->sourceModel(), w.searchMessageModel());
     QVERIFY(w.receiveTypingNotificationManager());
+    QVERIFY(!w.editingMode());
 }
diff --git a/src/apps/qml/MainComponent.qml b/src/apps/qml/MainComponent.qml
index 97cf97d9..ce7c2594 100644
--- a/src/apps/qml/MainComponent.qml
+++ b/src/apps/qml/MainComponent.qml
@@ -1,481 +1,481 @@
 /*
  * Copyright 2016  Riccardo Iaconelli <riccardo@kde.org>
  * Copyright (C) 2017-2019 Laurent Montel <montel@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 
 import QtQuick 2.9
 import QtQuick.Controls 1.4
 import QtQuick.Window 2.2
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.5 as QQC2
 
 import KDE.Ruqola.RuqolaUtils 1.0
 import KDE.Ruqola.Ruqola 1.0
 import KDE.Ruqola.Clipboard 1.0
 import KDE.Ruqola.RoomFilterProxyModel 1.0
 import org.kde.kirigami 2.4 as Kirigami
 import KDE.Ruqola.DebugCategory 1.0
 import KDE.Ruqola.ReceiveTypingNotificationManager 1.0
 import KDE.Ruqola.DebugCategory 1.0
 
 Component {
     id: mainComponent
 
 
     Kirigami.Page {
 
         id: mainWidget
         leftPadding: Kirigami.Units.smallSpacing
         rightPadding: Kirigami.Units.smallSpacing
         topPadding: Kirigami.Units.smallSpacing
         bottomPadding: Kirigami.Units.smallSpacing
         actions {
             contextualActions: [
                 Kirigami.Action {
                     id: editAction
                     iconName: "list-add"
                     text: i18n("Open room");
                     onTriggered: {
                         searchChannelDialog.initializeAndOpen();
                     }
                 },
                 Kirigami.Action {
                     iconName: "edit-symbolic"
                     text: i18n("Edit room");
                     checkable: true
                     onToggled: {
-                        roomsList.editingMode = checked
+                        appid.rocketChatAccount.switchEditingMode(checked);
                         // do stuff
                     }
                 },
                 Kirigami.Action {
                     text: i18n("Create New Channel")
                     onTriggered: {
                         createNewChannelDialog.encryptedRoomEnabled = appid.rocketChatAccount.encryptedEnabled()
                         createNewChannelDialog.initializeAndOpen()
                     }
                 },
                 Kirigami.Action {
                    separator: true
                 },
                 Kirigami.Action {
                     text: i18n("Server Info")
                     onTriggered: {
                         serverinfodialog.rcAccount = appid.rocketChatAccount
                         serverinfodialog.open();
                     }
                 }
 
             ]
         }
 
         header: Column {
 
             RowLayout {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.leftMargin: 2*Kirigami.Units.smallSpacing
                 visible: appid.selectedRoom
 
                 ToolButton {
                     iconName: "favorite"
                     checkable: true
                     Binding on checked {
                         value: appid.selectedRoom && appid.selectedRoom.favorite
                     }
                     onCheckedChanged: {
                         appid.rocketChatAccount.changeFavorite(appid.selectedRoomID, checked)
                     }
                 }
                 Kirigami.Icon {
                     source: "encrypted"
                     //FIXME
                     height: 22
                     width: 22
                     visible: appid.selectedRoom && appid.selectedRoom.encrypted
                 }
                 Kirigami.Heading {
                     text: "#" + (appid.selectedRoom ? appid.selectedRoom.name : "")
                     level: 3
                     font.bold: true
                 }
                 Item {
                     Layout.fillWidth: true
                 }
                 ToolButton {
                     id: showNotification
                     iconName: "preferences-desktop-notification"
                     onClicked: {
                         notificationsDialog.roomInfo = appid.selectedRoom
                         notificationsDialog.open()
                     }
                 }
 
                 ToolButton {
                     id: showUsersButton
                     iconName: "system-users"
                     checkable: true
                 }
 
                 ToolButton {
                     id: searchMessage
                     iconName: "edit-find"
                     onClicked: {
                         searchMessageDialog.roomId = appid.selectedRoomID
                         searchMessageDialog.initializeAndOpen();
                     }
                 }
                 ToolButton {
                     iconName: "settings-configure"
                     onClicked: menu.open();
                     QQC2.Menu {
                         id: menu
                         y: parent.height
 
                         QQC2.MenuItem {
                             text: i18n("Channel Info")
                             onTriggered: {
                                 var channelType = appid.selectedRoom.channelType;
                                 if (channelType === "c" || channelType === "p") {
                                     //Only for debug
 //                                    if (channelType === "c") {
 //                                        appid.rocketChatAccount.channelInfo(appid.selectedRoom.rid);
 //                                    } else {
 //                                        appid.rocketChatAccount.groupInfo(appid.selectedRoom.rid);
 //                                    }
 
                                     channelInfoDialog.roomInfo = appid.selectedRoom
                                     channelInfoDialog.initializeAndOpen()
                                 } else if (channelType === "d") {
                                     privateChannelInfoDialog.roomInfo = appid.selectedRoom
                                     privateChannelInfoDialog.initializeAndOpen()
                                 } else {
                                     console.log(RuqolaDebugCategorySingleton.category,"channel type " + appid.selectedRoom.channelType)
                                 }
                             }
                         }
                         RuqolaMenuSeparator {
                         }
                         QQC2.MenuItem {
                             text: i18n("Video Chat")
                             onTriggered: {
                                 appid.rocketChatAccount.createJitsiConfCall(appid.selectedRoomID);
                             }
                         }
                         RuqolaMenuSeparator {
                         }
                         QQC2.MenuItem {
                             text: i18n("Add User In Room")
                             visible: appid.selectedRoom ? appid.selectedRoom.canBeModify : true
                             onTriggered: {
                                 var channelType = appid.selectedRoom.channelType;
                                 if (channelType === "c" || channelType === "p") {
                                     addUserDialog.roomInfo = appid.selectedRoom
                                     addUserDialog.roomId = appid.selectedRoomID
                                     addUserDialog.initializeAndOpen()
                                 }
                             }
                         }
                         RuqolaMenuSeparator {
                             visible: appid.selectedRoom ? appid.selectedRoom.canBeModify : true
                         }
                         QQC2.MenuItem {
                             text: i18n("Take a Video Message")
                             onTriggered: {
                                 takeVideoMessage.open();
                             }
                         }
                         RuqolaMenuSeparator {}
                         QQC2.MenuItem {
                             text: i18n("Load Recent History")
                             onTriggered: {
                                 appid.rocketChatAccount.loadHistory(appid.selectedRoomID);
                             }
                         }
                         RuqolaMenuSeparator {
                         }
                         QQC2.MenuItem {
                             text: i18n("Show Files Attachment In Room")
                             onTriggered: {
                                 appid.rocketChatAccount.roomFiles(appid.selectedRoomID, appid.selectedRoom.channelType);
                                 showFilesInRoomDialog.initializeAndOpen()
                             }
                         }
                     }
                 }
             }
 
             QQC2.Label {
                 visible: appid.selectedRoom && (appid.selectedRoom.topic !== "")
                 text: appid.selectedRoom ? appid.selectedRoom.topic : ""
                 font.italic: true
                 anchors.right: parent.right
                 anchors.left: parent.left
                 anchors.margins: 2*Kirigami.Units.smallSpacing
                 wrapMode: QQC2.Label.Wrap
             }
             QQC2.Label {
                 visible: appid.selectedRoom && (appid.selectedRoom.announcement !== "")
                 text: appid.selectedRoom ? appid.selectedRoom.announcement : ""
                 anchors.right: parent.right
                 anchors.left: parent.left
                 anchors.margins: 2*Kirigami.Units.smallSpacing
                 wrapMode: QQC2.Label.Wrap
                 onLinkActivated: {
                     RuqolaUtils.openUrl(link);
                 }
             }
 
             Rectangle {
                 color: Kirigami.Theme.textColor
                 height:1
                 anchors.right: parent.right
                 anchors.left: parent.left
                 opacity: .5
                 visible: appid.selectedRoom
             }
             Flow {
                 id: topBarUserList
                 readonly property bool isActive: showUsersButton.checked
                 anchors {
                     left: parent.left
                     right: parent.right
                     margins: Kirigami.Units.smallSpacing
                 }
                 opacity: topBarUserList.isActive ? 1 : 0
                 Behavior on opacity { NumberAnimation { duration: 650; easing.type: Easing.InOutQuad } }
 
                 Repeater {
                     model: parent.opacity > 0.5 ? appid.userModel : 0
                     RowLayout {
                         Kirigami.Icon {
                             source: model.iconstatus
                             //FIXME
                             height: 22
                             width: 22
                         }
                         QQC2.Label {
                             text: model.displayname
                             onLinkActivated: {
                                 openDirectChannelDialog.username = link;
                                 openDirectChannelDialog.open()
                             }
                         }
                     }
                 }
                 Item {
                     width: parent.width
                     height: topBarUserList.isActive ? 1 : 0
                     Rectangle {
                         height: parent.height
                         width: height > 0 ? parent.width : 0
                         anchors.centerIn: parent
                         Behavior on width { NumberAnimation { duration: 650; easing.type: Easing.InOutQuad } }
                         color: Kirigami.Theme.textColor
                     }
                 }
             }
         }
 
         Clipboard {
             id: clipboard
         }
 
         ActiveChat {
             id: activeChat
             model: appid.messageModel
             rcAccount: appid.rocketChatAccount
             roomId: appid.selectedRoomID
             anchors.fill: parent
             clip: true
 
             QQC2.ScrollBar.vertical: QQC2.ScrollBar { }
 
             onEditMessage: {
                 userInputMessage.messageId = messageId;
                 userInputMessage.setOriginalMessage(messageStr)
                 //console.log(RuqolaDebugCategorySingleton.category, "edit! messageId : " + messageId + " messageStr " + messageStr)
             }
             onCopyMessage: {
                 clipboard.text = messageStr
                 //console.log(RuqolaDebugCategorySingleton.category, "copy! messageId : " + messageId + " messageStr " + messageStr)
             }
             onReplyMessage: {
                 //console.log(RuqolaDebugCategorySingleton.category, "Not implemented reply message : " + messageId)
             }
             onSetFavoriteMessage: {
                 appid.rocketChatAccount.starMessage(messageId, roomId, starred)
             }
             onIgnoreUser: {
                 appid.rocketChatAccount.ignoreUser(roomId, userId, ignored)
             }
 
             onOpenChannel: {
                 openChannelDialog.channelName = channel
                 openChannelDialog.open()
             }
 
             onOpenDirectChannel: {
                 openDirectChannelDialog.username = userName;
                 openDirectChannelDialog.open()
             }
             onJitsiCallConfActivated: {
                 appid.rocketChatAccount.joinJitsiConfCall(roomId)
             }
             onDeleteMessage: {
                 deleteMessageDialog.msgId = messageId
                 deleteMessageDialog.open()
             }
             onDownloadAttachment: {
                 downloadFileDialog.fileToSaveUrl = url
                 downloadFileDialog.open()
             }
 
             onDisplayImage: {
                 displayImageDialog.iUrl = imageUrl
                 displayImageDialog.title = title
                 displayImageDialog.isAnimatedImage = isAnimatedImage
                 displayImageDialog.clearScaleAndOpen();
             }
             onDeleteReaction: {
                 appid.rocketChatAccount.reactOnMessage(messageId, emoji, false)
             }
 
             OpenChannelDialog {
                 id: openChannelDialog
                 onOpenChannel: {
                     appid.rocketChatAccount.openChannel(channelName);
                 }
             }
 
             OpenDirectChannelDialog {
                 id: openDirectChannelDialog
                 onOpenDirectChannel: {
                     if (appid.rocketChatAccount.userName !== userName) {
                         appid.rocketChatAccount.openDirectChannel(userName);
                     }
                 }
             }
 
             DeleteMessageDialog {
                 id: deleteMessageDialog
                 onDeleteMessage: {
                     appid.rocketChatAccount.deleteMessage(messageId, appid.selectedRoomID)
                 }
             }
 
             DownloadFileDialog {
                 id: downloadFileDialog
                 onAccepted: {
                     if (fileUrl != "") {
                         console.log(RuqolaDebugCategorySingleton.category, "You chose: " + fileUrl)
                         appid.rocketChatAccount.downloadFile(fileToSaveUrl, fileUrl)
                     } else {
                         console.log(RuqolaDebugCategorySingleton.category, "No file selected");
                     }
                 }
             }
             DisplayImageDialog {
                 id: displayImageDialog
             }
             UploadFileDialog {
                 id: uploadFileDialog
                 onUploadFile: {
                     appid.rocketChatAccount.uploadFile(appid.selectedRoomID, description, messageText, filename)
                 }
             }
 
             ShowFilesInRoomDialog {
                 id: showFilesInRoomDialog
                 filesModel: appid.filesModel
                 onDownloadFile: {
                     downloadFileDialog.fileToSaveUrl = file
                     downloadFileDialog.open()
                 }
                 onDeleteFile: {
                     appid.rocketChatAccount.deleteFileMessage(appid.selectedRoomID, fileid, appid.selectedRoom.channelType)
                 }
             }
             CreateNewChannelDialog {
                 id: createNewChannelDialog
                 onCreateNewChannel: {
                     rocketChatAccount.createNewChannel(name, readOnly, privateRoom, usernames, encryptedRoom, password);
                 }
             }
             ServerInfoDialog {
                 id: serverinfodialog
             }
         }
 
         Keys.onEscapePressed: {
             appid.rocketChatAccount.clearUnreadMessages(appid.selectedRoomID);
         }
 
         footer:
             ColumnLayout {
             anchors.bottom: mainWidget.bottom
             //anchors.margins: Kirigami.Units.smallSpacing
             QQC2.Label {
                 id: channelInfo
                 font.bold: true
                 anchors {
                     margins: Kirigami.Units.smallSpacing
                 }
                 Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
                 visible: appid.selectedRoom && ((appid.selectedRoom.readOnly === true) || (appid.selectedRoom.blocker === true) || (appid.selectedRoom.blocked === true))
                 text: appid.selectedRoom ? appid.selectedRoom.roomMessageInfo : ""
             }
 
             UserInput {
                 id: userInputMessage
                 rcAccount: appid.rocketChatAccount
                 visible: appid.selectedRoom && (appid.selectedRoom.readOnly === false) && (appid.selectedRoom.blocker === false) && (appid.selectedRoom.blocked === false)
                 messageLineText: rcAccount.getUserCurrentMessage(appid.selectedRoomID)
                 onTextEditing: {
                     rcAccount.textEditing(appid.selectedRoomID, str)
                     appid.userInputMessageText = str;
                 }
                 onClearUnreadMessages: {
                     rcAccount.clearUnreadMessages(appid.selectedRoomID)
                 }
                 onUploadFile: {
                     uploadFileDialog.initializeAndOpen()
                 }
             }
             QQC2.Label {
                 id: typingInfo
                 anchors.margins: 2*Kirigami.Units.smallSpacing
                 text: ""
             }
 
             Connections {
                 target: appid.rocketChatAccount.receiveTypingNotificationManager()
                 onNotificationChanged: {
                     //console.log(RuqolaDebugCategorySingleton.category, "Typing in roomId: " + roomId + " str " + notificationStr);
                     if (appid.selectedRoomID === roomId) {
                         typingInfo.text = notificationStr;
                     }
                 }
             }
         }
     }// mainWidget Item
 }
diff --git a/src/apps/qml/RoomsComponent.qml b/src/apps/qml/RoomsComponent.qml
index 302e4808..a0781adb 100644
--- a/src/apps/qml/RoomsComponent.qml
+++ b/src/apps/qml/RoomsComponent.qml
@@ -1,119 +1,120 @@
 /*
  * Copyright 2016  Riccardo Iaconelli <riccardo@kde.org>
  * Copyright (C) 2017-2019 Laurent Montel <montel@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 import QtQuick 2.9
 import QtQuick.Controls 1.4
 import QtQuick.Window 2.2
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.5 as QQC2
 import KDE.Ruqola.RocketChatAccount 1.0
 import KDE.Ruqola.Ruqola 1.0
 import KDE.Ruqola.RoomFilterProxyModel 1.0
 import KDE.Ruqola.UsersForRoomFilterProxyModel 1.0
 import org.kde.kirigami 2.4 as Kirigami
 import KDE.Ruqola.StatusModel 1.0
 
 Component {
     id: roomsComponent
     Kirigami.ScrollablePage {
         id: roomsPage
         background: Rectangle {
             color: Kirigami.Theme.backgroundColor
         }
         header: Column {
 
             ColumnLayout {
                 anchors.left: parent.left
                 anchors.right: parent.right
                 RowLayout {
                     Layout.alignment: Qt.AlignLeft
                     anchors.leftMargin: 2*Kirigami.Units.smallSpacing
                     QQC2.Label {
                         id: comboboxLabel
 
                         text: i18n("Status:")
                     }
 
                     QQC2.ComboBox {
                         id: statusCombobox
                         Layout.alignment: Qt.AlignLeft
                         model: appid.rocketChatAccount.statusModel()
                         textRole: "statusi18n"
                         onActivated: {
                             appid.rocketChatAccount.changeDefaultStatus(index)
                         }
                         currentIndex: model.currentStatus
 
                         delegate: Kirigami.BasicListItem {
                             icon: model.icon
 
                             label: model.statusi18n
                         }
                     }
                 }
                 QQC2.TextField {
                     id: searchField
                     focus: true
                     Layout.minimumHeight: Layout.maximumHeight
                     Layout.maximumHeight: Kirigami.Units.iconSizes.smallMedium + Kirigami.Units.smallSpacing * 2
                     Layout.fillWidth: true
                     //width: parent.width
                     placeholderText: i18n("Search room...")
                     onTextChanged: {
                         appid.rocketChatAccount.roomFilterProxyModel().setFilterString(text);
                         //TODO filter list view
                     }
                 }
             }
         }
 
         mainItem:
             RoomsView {
             id: roomsList
+            editingMode: appid.rocketChatAccount.editingMode
             implicitWidth: Kirigami.Units.gridUnit * 10
             anchors.fill: parent
             model: appid.rocketChatAccount.roomFilterProxyModel()
             selectedRoomID: appid.selectedRoomID;
             onHideRoom: {
                 rocketChatAccount.hideRoom(roomID)
             }
             onLeaveRoom: {
                 //TODO move to desktop.qml
                 leaveChannelDialog.rId = roomID
                 leaveChannelDialog.roomInfo = appid.selectedRoom
                 leaveChannelDialog.open()
             }
 
             onRoomSelected: {
                 if (roomID == selectedRoomID) {
                     return;
                 }
                 appid.rocketChatAccount.setUserCurrentMessage(appid.userInputMessageText, selectedRoomID)
                 appid.selectedRoomID = roomID;
                 appid.messageModel = appid.rocketChatAccount.messageModelForRoom(roomID)
                 appid.selectedRoom = appid.rocketChatAccount.getRoomWrapper(roomID)
                 appid.userModel = appid.rocketChatAccount.usersForRoomFilterProxyModel(roomID)
                 appid.filesModel = appid.rocketChatAccount.filesForRoomFilterProxyModel(roomID)
             }
         } //RoomsView
     }
 }
diff --git a/src/ruqolacore/model/roommodel.h b/src/ruqolacore/model/roommodel.h
index 391f7cf2..9f9db4ed 100644
--- a/src/ruqolacore/model/roommodel.h
+++ b/src/ruqolacore/model/roommodel.h
@@ -1,138 +1,139 @@
 /*
 
  * Copyright 2016  Riccardo Iaconelli <riccardo@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 #ifndef ROOMMODEL_H
 #define ROOMMODEL_H
 #include "libruqolacore_export.h"
 #include "room.h"
 #include "user.h"
 #include <QAbstractListModel>
 #include <QObject>
 class RoomWrapper;
 class RocketChatAccount;
 class FilesForRoomModel;
 class FilesForRoomFilterProxyModel;
 class MessageModel;
 
 class LIBRUQOLACORE_EXPORT RoomModel : public QAbstractListModel
 {
     Q_OBJECT
 public:
 
     enum RoomRoles {
         RoomName = Qt::UserRole + 1,
         RoomSelected,
         RoomID,
         RoomUnread,
         RoomType,
         RoomOwnerUserName, //created by UserName
         RoomOwnerUserID,
         RoomTopic,
         RoomMutedUsers,
         RoomJitsiTimeout,
         RoomRo,
         RoomAnnouncement,
         RoomOpen,
         RoomAlert,
         RoomOrder,
         RoomFavorite,
         RoomSection,
         RoomIcon,
         RoomOtr,
         RoomUserMentions,
         RoomIgnoredUsers,
     };
     Q_ENUM(RoomRoles)
 
     explicit RoomModel(RocketChatAccount *account = nullptr, QObject *parent = nullptr);
     ~RoomModel() override;
 
     Q_REQUIRED_RESULT int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     Q_REQUIRED_RESULT QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
 
     /**
     * @brief Constructs room object from @param roomID and @param roomName and @param selected, then calls @method addRoom
     *
     * @param roomID The unique room ID
     * @param roomName The name of the room
     * @param selected True if room if @param roomID is selected, else false
     */
     Q_INVOKABLE void addRoom(const QString &roomID, const QString &roomName, bool selected = false);
 
     /**
     * @brief Finds a room with @param roomID in m_roomsList
     *
     * @param roomID The ID of the room to find
     * @return RoomWrapper Pointer, The pointer to room with @param roomID in m_roomsList, if exists. Else return a new RoomWrapper object
     */
     RoomWrapper *findRoomWrapper(const QString &roomID) const;
 
     //Clear data and refill it with data in the cache, if there is
     void reset();
     void clear();
 
     void updateSubscription(const QJsonArray &array);
     void updateRoom(const QJsonObject &array);
     Room *addRoom(const QJsonObject &room);
     /**
     * @brief Adds a room to m_roomsList with @param room
     *
     * @param room The room to be added
     */
     void addRoom(Room *room);
     void removeRoom(const QString &roomId);
 
     void getUnreadAlertFromAccount(bool &hasAlert, int &nbUnread);
     void userStatusChanged(const User &user);
 
     UsersForRoomModel *usersModelForRoom(const QString &roomId) const;
 
     UsersForRoomFilterProxyModel *usersForRoomFilterProxyModel(const QString &roomId) const;
 
     FilesForRoomModel *filesModelForRoom(const QString &roomId) const;
 
     FilesForRoomFilterProxyModel *filesForRoomFilterProxyModel(const QString &roomId) const;
 
     MessageModel *messageModel(const QString &roomId) const;
 
     Q_REQUIRED_RESULT QHash<int, QByteArray> roleNames() const override;
 
     Q_REQUIRED_RESULT QString inputMessage(const QString &roomId) const;
     void setInputMessage(const QString &roomId, const QString &inputMessage);
     Q_REQUIRED_RESULT Room *findRoom(const QString &roomID) const;
     void updateSubscriptionRoom(const QJsonObject &room);
     Q_REQUIRED_RESULT QString insertRoom(const QJsonObject &room);
+
 Q_SIGNALS:
     void needToUpdateNotification();
 
 private:
     Q_DISABLE_COPY(RoomModel)
     Room *createNewRoom();
     QIcon icon(Room *r) const;
     int order(Room *r) const;
     QString sectionName(Room *r) const;
 
     RocketChatAccount *mRocketChatAccount = nullptr;
     QVector<Room *> mRoomsList;
 };
 
 #endif // ROOMMODEL_H
diff --git a/src/ruqolacore/rocketchataccount.cpp b/src/ruqolacore/rocketchataccount.cpp
index b0eb6604..46b62a87 100644
--- a/src/ruqolacore/rocketchataccount.cpp
+++ b/src/ruqolacore/rocketchataccount.cpp
@@ -1,1284 +1,1297 @@
 /*
    Copyright (c) 2017-2019 Montel Laurent <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 "model/messagemodel.h"
 #include "rocketchataccount.h"
 #include "model/roommodel.h"
 #include "roomwrapper.h"
 #include "typingnotification.h"
 #include "model/usersmodel.h"
 #include "ruqola_debug.h"
 #include "ruqola.h"
 #include "messagequeue.h"
 #include "rocketchatbackend.h"
 #include "model/roomfilterproxymodel.h"
 #include "ruqolalogger.h"
 #include "ruqolaserverconfig.h"
 #include "model/usercompletermodel.h"
 #include "model/usercompleterfilterproxymodel.h"
 #include "model/statusmodel.h"
 #include "utils.h"
 #include "rocketchatcache.h"
 #include "emojimanager.h"
 #include "otrmanager.h"
 #include "inputtextmanager.h"
 #include "model/usersforroommodel.h"
 #include "model/filesforroommodel.h"
 #include "model/searchchannelfilterproxymodel.h"
 #include "model/searchchannelmodel.h"
 #include "model/loginmethodmodel.h"
 #include "model/inputcompletermodel.h"
 #include "model/searchmessagemodel.h"
 #include "model/searchmessagefilterproxymodel.h"
 #include "managerdatapaths.h"
 #include "authenticationmanager.h"
 
 #include "ddpapi/ddpclient.h"
 #include "receivetypingnotificationmanager.h"
 #include "restapirequest.h"
 #include "serverconfiginfo.h"
 
 #include <QDesktopServices>
 #include <QRegularExpression>
 #include <QTimer>
 
 #include <plugins/pluginauthentication.h>
 #include <plugins/pluginauthenticationinterface.h>
 
 #define USE_REASTAPI_JOB 1
 
 RocketChatAccount::RocketChatAccount(const QString &accountFileName, QObject *parent)
     : QObject(parent)
 {
     qCDebug(RUQOLA_LOG) << " RocketChatAccount::RocketChatAccount(const QString &accountFileName, QObject *parent)"<<accountFileName;
     //create an unique file for each account
     if (!qEnvironmentVariableIsEmpty("RUQOLA_LOGFILE")) {
         mRuqolaLogger = new RuqolaLogger;
     }
 
     mServerConfigInfo = new ServerConfigInfo(this, this);
     //Create it before loading settings
     mLoginMethodModel = new LoginMethodModel(this);
     mInputTextManager = new InputTextManager(this, this);
     mRuqolaServerConfig = new RuqolaServerConfig;
     mReceiveTypingNotificationManager = new ReceiveTypingNotificationManager(this);
 
     initializeAuthenticationPlugins();
 
     loadSettings(accountFileName);
 
     mRocketChatBackend = new RocketChatBackend(this, this);
 
     //After loadSettings
     mEmojiManager = new EmojiManager(this);
     mEmojiManager->setServerUrl(mSettings->serverUrl());
     mOtrManager = new OtrManager(this);
     mRoomFilterProxyModel = new RoomFilterProxyModel(this);
 
     mUserCompleterModel = new UserCompleterModel(this);
     mUserCompleterFilterModelProxy = new UserCompleterFilterProxyModel(this);
     mUserCompleterFilterModelProxy->setSourceModel(mUserCompleterModel);
 
     mSearchChannelModel = new SearchChannelModel(this);
     mSearchChannelFilterProxyModel = new SearchChannelFilterProxyModel(this);
     mSearchChannelFilterProxyModel->setSourceModel(mSearchChannelModel);
 
     mSearchMessageModel = new SearchMessageModel(this);
     mSearchMessageFilterProxyModel = new SearchMessageFilterProxyModel(this);
     mSearchMessageFilterProxyModel->setSourceModel(mSearchMessageModel);
 
     mStatusModel = new StatusModel(this);
     mRoomModel = new RoomModel(this, this);
     connect(mRoomModel, &RoomModel::needToUpdateNotification, this, &RocketChatAccount::slotNeedToUpdateNotification);
     mRoomFilterProxyModel->setSourceModel(mRoomModel);
     mUserModel = new UsersModel(this);
     connect(mUserModel, &UsersModel::userStatusChanged, this, &RocketChatAccount::userStatusChanged);
     mMessageQueue = new MessageQueue(this, this); //TODO fix mem leak !
     mTypingNotification = new TypingNotification(this);
     mCache = new RocketChatCache(this, this);
     connect(mCache, &RocketChatCache::fileDownloaded, this, &RocketChatAccount::fileDownloaded);
     connect(mTypingNotification, &TypingNotification::informTypingStatus, this, &RocketChatAccount::slotInformTypingStatus);
     QTimer::singleShot(0, this, &RocketChatAccount::clearModels);
 }
 
 RocketChatAccount::~RocketChatAccount()
 {
     delete mCache;
     mCache = nullptr;
 
     delete mRuqolaServerConfig;
     delete mRuqolaLogger;
 }
 
 void RocketChatAccount::removeSettings()
 {
     mSettings->removeSettings();
 }
 
 void RocketChatAccount::loadSettings(const QString &accountFileName)
 {
     delete mSettings;
     mSettings = new RocketChatAccountSettings(accountFileName, this);
     connect(mSettings, &RocketChatAccountSettings::serverURLChanged, this, &RocketChatAccount::serverUrlChanged);
     connect(mSettings, &RocketChatAccountSettings::userIDChanged, this, &RocketChatAccount::userIDChanged);
     connect(mSettings, &RocketChatAccountSettings::userNameChanged, this, &RocketChatAccount::userNameChanged);
     connect(mSettings, &RocketChatAccountSettings::passwordChanged, this, &RocketChatAccount::passwordChanged);
 }
 
 void RocketChatAccount::slotNeedToUpdateNotification()
 {
     bool hasAlert = false;
     int nbUnread = 0;
     mRoomModel->getUnreadAlertFromAccount(hasAlert, nbUnread);
     Q_EMIT updateNotification(hasAlert, nbUnread, accountName());
 }
 
 void RocketChatAccount::clearModels()
 {
     // Clear rooms data and refill it with data in the cache, if there is
     mRoomModel->reset();
 
     mMessageQueue->loadCache();
     //Try to send queue message
     mMessageQueue->processQueue();
 }
 
 SearchChannelFilterProxyModel *RocketChatAccount::searchChannelFilterProxyModel() const
 {
     return mSearchChannelFilterProxyModel;
 }
 
 SearchChannelModel *RocketChatAccount::searchChannelModel() const
 {
     return mSearchChannelModel;
 }
 
 UserCompleterModel *RocketChatAccount::userCompleterModel() const
 {
     return mUserCompleterModel;
 }
 
 UserCompleterFilterProxyModel *RocketChatAccount::userCompleterFilterModelProxy() const
 {
     return mUserCompleterFilterModelProxy;
 }
 
 EmojiManager *RocketChatAccount::emojiManager() const
 {
     return mEmojiManager;
 }
 
 QString RocketChatAccount::userStatusIconFileName(const QString &name)
 {
     return mUserModel->userStatusIconFileName(name);
 }
 
 StatusModel *RocketChatAccount::statusModel() const
 {
     return mStatusModel;
 }
 
 RuqolaServerConfig *RocketChatAccount::ruqolaServerConfig() const
 {
     return mRuqolaServerConfig;
 }
 
 RuqolaLogger *RocketChatAccount::ruqolaLogger() const
 {
     return mRuqolaLogger;
 }
 
 RoomFilterProxyModel *RocketChatAccount::roomFilterProxyModel() const
 {
     return mRoomFilterProxyModel;
 }
 
 UsersForRoomFilterProxyModel *RocketChatAccount::usersForRoomFilterProxyModel(const QString &roomId) const
 {
     return mRoomModel->usersForRoomFilterProxyModel(roomId);
 }
 
 FilesForRoomFilterProxyModel *RocketChatAccount::filesForRoomFilterProxyModel(const QString &roomId) const
 {
     return mRoomModel->filesForRoomFilterProxyModel(roomId);
 }
 
 RocketChatBackend *RocketChatAccount::rocketChatBackend() const
 {
     return mRocketChatBackend;
 }
 
 MessageQueue *RocketChatAccount::messageQueue() const
 {
     return mMessageQueue;
 }
 
 RocketChatAccountSettings *RocketChatAccount::settings() const
 {
     return mSettings;
 }
 
 void RocketChatAccount::slotInformTypingStatus(const QString &room, bool typing)
 {
     ddp()->informTypingStatus(room, typing, mSettings->userName());
 }
 
 RoomModel *RocketChatAccount::roomModel() const
 {
     return mRoomModel;
 }
 
 UsersModel *RocketChatAccount::usersModel() const
 {
     return mUserModel;
 }
 
 Room *RocketChatAccount::getRoom(const QString &roomId)
 {
     return mRoomModel->findRoom(roomId);
 }
 
 RoomWrapper *RocketChatAccount::getRoomWrapper(const QString &roomId)
 {
     return mRoomModel->findRoomWrapper(roomId);
 }
 
 MessageModel *RocketChatAccount::messageModelForRoom(const QString &roomID)
 {
     return mRoomModel->messageModel(roomID);
 }
 
 QString RocketChatAccount::getUserCurrentMessage(const QString &roomId)
 {
     return mRoomModel->inputMessage(roomId);
 }
 
 void RocketChatAccount::setUserCurrentMessage(const QString &message, const QString &roomId)
 {
     mRoomModel->setInputMessage(roomId, message);
 }
 
 void RocketChatAccount::setInputTextChanged(const QString &str, int position)
 {
     mInputTextManager->setInputTextChanged(str, position);
 }
 
 QString RocketChatAccount::replaceWord(const QString &newWord, const QString &str, int position)
 {
     return mInputTextManager->replaceWord(newWord, str, position);
 }
 
 void RocketChatAccount::textEditing(const QString &roomId, const QString &str)
 {
     mTypingNotification->setText(roomId, str);
 }
 
 void RocketChatAccount::reactOnMessage(const QString &messageId, const QString &emoji, bool shouldReact)
 {
     restApi()->reactOnMessage(messageId, emoji, shouldReact);
 }
 
 void RocketChatAccount::sendMessage(const QString &roomID, const QString &message)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->postMessage(roomID, message);
 #else
     QJsonObject json;
     json[QStringLiteral("rid")] = roomID;
     json[QStringLiteral("msg")] = message;
 
     ddp()->method(QStringLiteral("sendMessage"), QJsonDocument(json), DDPClient::Persistent);
 #endif
 }
 
 void RocketChatAccount::updateMessage(const QString &roomID, const QString &messageId, const QString &message)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->updateMessage(roomID, messageId, message);
 #else
     QJsonObject json;
     json[QStringLiteral("rid")] = roomID;
     json[QStringLiteral("msg")] = message;
     json[QStringLiteral("_id")] = messageId;
 
     ddp()->method(QStringLiteral("updateMessage"), QJsonDocument(json), DDPClient::Persistent);
 #endif
 }
 
 QString RocketChatAccount::avatarUrlFromDirectChannel(const QString &rid)
 {
     return mCache->avatarUrl(Utils::userIdFromDirectChannel(rid, userID()));
 }
 
 void RocketChatAccount::deleteFileMessage(const QString &roomId, const QString &fileId, const QString &channelType)
 {
     ddp()->deleteFileMessage(roomId, fileId, channelType);
 }
 
 QString RocketChatAccount::avatarUrl(const QString &userId)
 {
     return mCache->avatarUrl(userId);
 }
 
 void RocketChatAccount::insertAvatarUrl(const QString &userId, const QString &url)
 {
     mCache->insertAvatarUrl(userId, url);
 }
 
 RocketChatRestApi::RestApiRequest *RocketChatAccount::restApi()
 {
     if (!mRestApi) {
         mRestApi = new RocketChatRestApi::RestApiRequest(this);
         connect(mRestApi, &RocketChatRestApi::RestApiRequest::setChannelJoinDone, this, &RocketChatAccount::setChannelJoinDone);
         connect(mRestApi, &RocketChatRestApi::RestApiRequest::missingChannelPassword, this, &RocketChatAccount::missingChannelPassword);
         connect(mRestApi, &RocketChatRestApi::RestApiRequest::openArchivedRoom, this, &RocketChatAccount::openArchivedRoom);
         mRestApi->setServerUrl(mSettings->serverUrl());
         mRestApi->setRestApiLogger(mRuqolaLogger);
     }
     return mRestApi;
 }
 
 void RocketChatAccount::leaveRoom(const QString &roomId, const QString &channelType)
 {
 #ifdef USE_REASTAPI_JOB
     if (channelType == QStringLiteral("c")) {
         restApi()->leaveChannel(roomId);
     } else if (channelType == QStringLiteral("p")) {
         restApi()->leaveGroups(roomId);
     } else {
         qCWarning(RUQOLA_LOG) << " unsupport leave room for type " << channelType;
     }
 #else
     Q_UNUSED(channelType)
     ddp()->leaveRoom(roomId);
 #endif
 }
 
 void RocketChatAccount::hideRoom(const QString &roomId, const QString &channelType)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->closeChannel(roomId, channelType);
 #else
     Q_UNUSED(channelType)
     ddp()->hideRoom(roomId);
 #endif
 }
 
 DDPClient *RocketChatAccount::ddp()
 {
     if (!mDdp) {
         mDdp = new DDPClient(this, this);
         connect(mDdp, &DDPClient::loginStatusChanged, this, &RocketChatAccount::loginStatusChanged);
         connect(mDdp, &DDPClient::connectedChanged, this, &RocketChatAccount::connectedChanged);
         connect(mDdp, &DDPClient::changed, this, &RocketChatAccount::changed);
         connect(mDdp, &DDPClient::added, this, &RocketChatAccount::added);
         connect(mDdp, &DDPClient::removed, this, &RocketChatAccount::removed);
 
         if (mSettings) {
             mDdp->setServerUrl(mSettings->serverUrl());
         }
         mDdp->start();
     }
     return mDdp;
 }
 
+bool RocketChatAccount::editingMode() const
+{
+    return mEditingMode;
+}
+
 DDPClient::LoginStatus RocketChatAccount::loginStatus()
 {
     if (mDdp) {
         return ddp()->loginStatus();
     } else {
         return DDPClient::LoggedOut;
     }
 }
 
 void RocketChatAccount::tryLogin()
 {
     qCDebug(RUQOLA_LOG) << "Attempting login" << mSettings->userName() << "on" << mSettings->serverUrl();
 
     delete mDdp;
     mDdp = nullptr;
 
     // This creates a new ddp() object.
     // DDP will automatically try to connect and login.
     ddp();
 
     // In the meantime, load cache...
     mRoomModel->reset();
 }
 
 void RocketChatAccount::logOut()
 {
     mSettings->logout();
 
     mRoomModel->clear();
 #ifdef USE_REASTAPI_JOB
     restApi()->logout();
 #else
     QJsonObject user;
     user[QStringLiteral("username")] = mSettings->userName();
     QJsonObject json;
     json[QStringLiteral("user")] = user;
     ddp()->method(QStringLiteral("logout"), QJsonDocument(json));
 #endif
     delete mDdp;
     mDdp = nullptr;
     Q_EMIT logoutDone(accountName());
     Q_EMIT loginStatusChanged();
     qCDebug(RUQOLA_LOG) << "Successfully logged out!";
 }
 
 void RocketChatAccount::clearUnreadMessages(const QString &roomId)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->markAsRead(roomId);
 #else
     //TODO don't send message when we don't have unread message
     ddp()->clearUnreadMessages(roomId);
 #endif
 }
 
 void RocketChatAccount::changeFavorite(const QString &roomId, bool checked)
 {
 #ifdef USE_REASTAPI_JOB
     if (mRuqolaServerConfig->hasAtLeastVersion(0, 64, 0)) {
         restApi()->markAsFavorite(roomId, checked);
     } else {
         ddp()->toggleFavorite(roomId, checked);
     }
 #else
     ddp()->toggleFavorite(roomId, checked);
 #endif
 }
 
 void RocketChatAccount::openChannel(const QString &url)
 {
     //TODO use restapi
     qCDebug(RUQOLA_LOG) << " void RocketChatAccount::openChannel(const QString &url)"<<url;
 #ifdef USE_REASTAPI_JOB
     restApi()->channelJoin(url, QString());
 #else
     ddp()->joinRoom(url, QString());
 #endif
     //TODO search correct room + select it.
 }
 
 void RocketChatAccount::setChannelJoinDone(const QString &roomId)
 {
     ddp()->subscribeRoomMessage(roomId);
 }
 
 void RocketChatAccount::openArchivedRoom(const QString &roomId)
 {
     //TODO
 }
 
 void RocketChatAccount::joinJitsiConfCall(const QString &roomId)
 {
     qCDebug(RUQOLA_LOG) << " void RocketChatAccount::joinJitsiConfCall(const QString &roomId)"<<roomId;
     const QString hash = QString::fromLatin1(QCryptographicHash::hash((mRuqolaServerConfig->uniqueId() + roomId).toUtf8(), QCryptographicHash::Md5).toHex());
 #if defined(Q_OS_IOS) || defined(Q_OS_ANDROID)
     const QString scheme = "org.jitsi.meet://";
 #else
     const QString scheme = QStringLiteral("https://");
 #endif
     const QString url = scheme + mRuqolaServerConfig->jitsiMeetUrl() + QLatin1Char('/') + mRuqolaServerConfig->jitsiMeetPrefix() + hash;
     const QUrl clickedUrl = QUrl::fromUserInput(url);
     QDesktopServices::openUrl(clickedUrl);
 }
 
 void RocketChatAccount::eraseRoom(const QString &roomId, const QString &channelType)
 {
 #ifdef USE_REASTAPI_JOB_NOT_SUPPORTED_YET
     //Leave ! or close for direct channel.
     //restApi()->closeChannel(roomId, channelType);
 #else
     Q_UNUSED(channelType);
     ddp()->eraseRoom(roomId);
 #endif
 }
 
 void RocketChatAccount::openDirectChannel(const QString &username)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->createDirectMessage(username);
 #else
     ddp()->openDirectChannel(username);
 #endif
 }
 
 void RocketChatAccount::createNewChannel(const QString &name, bool readOnly, bool privateRoom, const QString &userNames, bool encryptedRoom, const QString &password)
 {
     //TODO password
     //TODO use encryted room
     if (!name.trimmed().isEmpty()) {
         const QStringList lstUsers = userNames.split(QLatin1Char(','), QString::SkipEmptyParts);
 #ifdef USE_REASTAPI_JOB
         if (privateRoom) {
             restApi()->createGroups(name, readOnly, lstUsers);
         } else {
             restApi()->createChannels(name, readOnly, lstUsers, password);
         }
 #else
         if (privateRoom) {
             ddp()->createPrivateGroup(name, lstUsers);
         } else {
             ddp()->createChannel(name, lstUsers, readOnly);
         }
 #endif
     } else {
         qCDebug(RUQOLA_LOG) << "Channel name can't be empty";
     }
 }
 
 void RocketChatAccount::joinRoom(const QString &roomId, const QString &joinCode)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->channelJoin(roomId, joinCode);
 #else
     //TODO use restapi
     ddp()->joinRoom(roomId, joinCode);
 #endif
 }
 
 void RocketChatAccount::channelAndPrivateAutocomplete(const QString &pattern)
 {
     //TODO use restapi
     if (pattern.isEmpty()) {
         searchChannelModel()->clear();
     } else {
         //Avoid to show own user
         const QString addUserNameToException = userName();
         ddp()->channelAndPrivateAutocomplete(pattern, addUserNameToException);
     }
 }
 
 void RocketChatAccount::listEmojiCustom()
 {
 #ifdef USE_REASTAPI_JOB
     if (mRuqolaServerConfig->hasAtLeastVersion(0, 63, 0)) {
 #ifdef USE_REASTAPI_JOB
         restApi()->listEmojiCustom();
         connect(restApi(), &RocketChatRestApi::RestApiRequest::loadEmojiCustomDone, this, &RocketChatAccount::loadEmojiRestApi, Qt::UniqueConnection);
 #else
         ddp()->listEmojiCustom();
 #endif
     } else {
         ddp()->listEmojiCustom();
     }
 #else
     ddp()->listEmojiCustom();
 #endif
 }
 
 void RocketChatAccount::setDefaultStatus(User::PresenceStatus status)
 {
     //Not implemented yet
     //TODO use restapi
     ddp()->setDefaultStatus(status);
 }
 
 void RocketChatAccount::changeDefaultStatus(int index)
 {
     setDefaultStatus(mStatusModel->status(index));
 }
 
 void RocketChatAccount::loadEmojiRestApi(const QJsonObject &obj)
 {
     mEmojiManager->loadEmoji(obj, true);
 }
 
 void RocketChatAccount::loadEmoji(const QJsonObject &obj)
 {
     mEmojiManager->loadEmoji(obj, false);
 }
 
 void RocketChatAccount::deleteMessage(const QString &messageId, const QString &roomId)
 {
 #ifdef USE_REASTAPI_JOB
     restApi()->deleteMessage(roomId, messageId);
 #else
     Q_UNUSED(roomId);
     ddp()->deleteMessage(messageId);
 #endif
 }
 
 void RocketChatAccount::insertFilesList(const QString &roomId)
 {
     FilesForRoomModel *filesForRoomModel = roomModel()->filesModelForRoom(roomId);
     if (filesForRoomModel) {
         filesForRoomModel->setFiles(rocketChatBackend()->files());
     } else {
         qCWarning(RUQOLA_LOG) << " Impossible to find room " << roomId;
     }
 }
 
 void RocketChatAccount::insertCompleterUsers()
 {
     userCompleterModel()->insertUsers(rocketChatBackend()->users());
 }
 
 void RocketChatAccount::userAutocomplete(const QString &searchText, const QString &exception)
 {
     //Clear before to create new search
     userCompleterModel()->clear();
     rocketChatBackend()->clearUsersList();
     if (!searchText.isEmpty()) {
         //Avoid to show own user
         QString addUserNameToException;
         if (exception.isEmpty()) {
             addUserNameToException = userName();
         } else {
             addUserNameToException = exception + QLatin1Char(',') + userName();
         }
         //TODO use restapi
         ddp()->userAutocomplete(searchText, addUserNameToException);
     }
 }
 
 void RocketChatAccount::getUsersOfRoom(const QString &roomId)
 {
     //TODO use restapi
     ddp()->getUsersOfRoom(roomId, true);
 }
 
 void RocketChatAccount::parseUsersForRooms(const QString &roomId, const QJsonObject &root)
 {
     UsersForRoomModel *usersModelForRoom = roomModel()->usersModelForRoom(roomId);
     if (usersModelForRoom) {
         usersModelForRoom->parseUsersForRooms(root, mUserModel);
     } else {
         qCWarning(RUQOLA_LOG) << " Impossible to find room " << roomId;
     }
 }
 
 void RocketChatAccount::loadAutoCompleteChannel(const QJsonObject &obj)
 {
     mSearchChannelModel->parseChannels(obj);
 }
 
 UsersForRoomModel *RocketChatAccount::usersModelForRoom(const QString &roomId) const
 {
     return mRoomModel->usersModelForRoom(roomId);
 }
 
 void RocketChatAccount::roomFiles(const QString &roomId, const QString &channelType)
 {
 #ifdef USE_REASTAPI_JOB
     connect(restApi(), &RocketChatRestApi::RestApiRequest::channelFilesDone, this, &RocketChatAccount::slotChannelFilesDone, Qt::UniqueConnection);
     restApi()->filesInRoom(roomId, channelType);
 #else
     Q_UNUSED(channelType);
     rocketChatBackend()->clearFilesList();
     ddp()->roomFiles(roomId);
 #endif
 }
 
 QVector<File> RocketChatAccount::parseFilesInChannel(const QJsonObject &obj)
 {
     //TODO add autotests
     QVector<File> files;
     const QJsonArray filesArray = obj.value(QLatin1String("files")).toArray();
     files.reserve(filesArray.count());
     for (int i = 0; i < filesArray.count(); ++i) {
         QJsonObject fileObj = filesArray.at(i).toObject();
         File f;
         f.parseFile(fileObj, true);
         files.append(f);
     }
     return files;
 }
 
 ReceiveTypingNotificationManager *RocketChatAccount::receiveTypingNotificationManager() const
 {
     return mReceiveTypingNotificationManager;
 }
 
 void RocketChatAccount::slotChannelFilesDone(const QJsonObject &obj, const QString &roomId)
 {
     const QVector<File> files = parseFilesInChannel(obj);
     FilesForRoomModel *filesForRoomModel = roomModel()->filesModelForRoom(roomId);
     if (filesForRoomModel) {
         filesForRoomModel->setFiles(files);
     } else {
         qCWarning(RUQOLA_LOG) << " Impossible to find room " << roomId;
     }
 }
 
 void RocketChatAccount::createJitsiConfCall(const QString &roomId)
 {
     //TODO use restapi
     ddp()->createJitsiConfCall(roomId);
     joinJitsiConfCall(roomId);
 }
 
 void RocketChatAccount::addUserToRoom(const QString &username, const QString &roomId, const QString &channelType)
 {
 #ifdef USE_REASTAPI_JOB_IMPOSSIBLE_YET
     restApi()->addUserInChannel(roomId, username);
     restApi()->addUserInGroup(roomId, username);
 #else
     Q_UNUSED(channelType);
     ddp()->addUserToRoom(username, roomId);
 #endif
 }
 
 void RocketChatAccount::clearSearchModel()
 {
     mSearchMessageModel->clear();
 }
 
 void RocketChatAccount::messageSearch(const QString &pattern, const QString &rid)
 {
     if (pattern.isEmpty()) {
         clearSearchModel();
     } else {
 #ifdef USE_REASTAPI_JOB
         connect(restApi(), &RocketChatRestApi::RestApiRequest::searchMessageDone, this, &RocketChatAccount::slotSearchMessages);
         restApi()->searchMessages(rid, pattern);
 #else
         ddp()->messageSearch(rid, pattern);
 #endif
     }
 }
 
 void RocketChatAccount::slotSearchMessages(const QJsonObject &obj)
 {
     mSearchMessageModel->parseResult(obj, true);
 }
 
 void RocketChatAccount::starMessage(const QString &messageId, const QString &rid, bool starred)
 {
 #ifdef USE_REASTAPI_JOB
     Q_UNUSED(rid);
     restApi()->starMessage(messageId, starred);
 #else
     ddp()->starMessage(messageId, rid, starred);
 #endif
 }
 
 void RocketChatAccount::uploadFile(const QString &roomId, const QString &description, const QString &messageText, const QUrl &fileUrl)
 {
     restApi()->uploadFile(roomId, description, messageText, fileUrl);
 }
 
 void RocketChatAccount::changeChannelSettings(const QString &roomId, RocketChatAccount::RoomInfoType infoType, const QVariant &newValue, const QString &channelType)
 {
     switch (infoType) {
     case Announcement:
         if (channelType == QStringLiteral("c")) {
             restApi()->changeChannelAnnouncement(roomId, newValue.toString());
         } else if (channelType == QStringLiteral("p")) {
             //FOR the moment we can't change group announcement with restapi
             if (mRuqolaServerConfig->hasAtLeastVersion(0, 70, 0)) {
                 restApi()->changeGroupsAnnouncement(roomId, newValue.toString());
             } else {
                 ddp()->setRoomAnnouncement(roomId, newValue.toString());
             }
         } else {
             qCWarning(RUQOLA_LOG) << " unsupport change announcement for type " << channelType;
         }
         break;
     case Description:
         if (channelType == QStringLiteral("c")) {
             restApi()->changeChannelDescription(roomId, newValue.toString());
         } else if (channelType == QStringLiteral("p")) {
             restApi()->changeGroupsDescription(roomId, newValue.toString());
         } else {
             qCWarning(RUQOLA_LOG) << " unsupport change description for type " << channelType;
         }
         break;
     case Name:
         if (channelType == QStringLiteral("c")) {
 #ifdef USE_REASTAPI_JOB
             restApi()->changeChannelName(roomId, newValue.toString());
 #else
             ddp()->setRoomName(roomId, newValue.toString());
 #endif
         } else if (channelType == QStringLiteral("p")) {
             restApi()->changeGroupName(roomId, newValue.toString());
         } else {
             qCWarning(RUQOLA_LOG) << " unsupport change name for type " << channelType;
         }
         break;
     case Topic:
 #ifdef USE_REASTAPI_JOB
         if (channelType == QStringLiteral("c")) {
             restApi()->changeChannelTopic(roomId, newValue.toString());
         } else if (channelType == QStringLiteral("p")) {
             restApi()->changeGroupsTopic(roomId, newValue.toString());
         } else {
             qCWarning(RUQOLA_LOG) << " unsupport change topic for type " << channelType;
         }
 
 #else
         ddp()->setRoomTopic(roomId, newValue.toString());
 #endif
         break;
     case ReadOnly:
         ddp()->setRoomIsReadOnly(roomId, newValue.toBool());
         break;
     case Archive:
 #ifdef USE_REASTAPI_JOB
         if (channelType == QStringLiteral("c")) {
             restApi()->archiveChannel(roomId);
         } else if (channelType == QStringLiteral("p")) {
             restApi()->archiveGroups(roomId);
         } else {
             qCWarning(RUQOLA_LOG) << " unsupport archiving for type " << channelType;
         }
 #else
         //No argument here.
         ddp()->archiveRoom(roomId);
 #endif
         break;
     case RoomType:
         ddp()->setRoomType(roomId, newValue.toBool());
         break;
     case Encrypted:
         //TODO use restApi when there is some api
         ddp()->setRoomEncrypted(roomId, newValue.toBool());
         break;
     }
 }
 
 void RocketChatAccount::changeNotificationsSettings(const QString &roomId, RocketChatAccount::NotificationOptionsType notificationsType, const QVariant &newValue)
 {
     switch (notificationsType) {
     case DisableNotifications:
         restApi()->disableNotifications(roomId, newValue.toBool());
         break;
     case HideUnreadStatus:
         restApi()->hideUnreadStatus(roomId, newValue.toBool());
         break;
     case AudioNotifications:
         restApi()->audioNotifications(roomId, newValue.toString());
         break;
     case DesktopNotifications:
         restApi()->desktopNotifications(roomId, newValue.toString());
         break;
     case EmailNotifications:
         restApi()->emailNotifications(roomId, newValue.toString());
         break;
     case MobilePushNotifications:
         restApi()->mobilePushNotifications(roomId, newValue.toString());
         break;
     case UnreadAlert:
         restApi()->unreadAlert(roomId, newValue.toString());
         break;
     case MuteGroupMentions:
         restApi()->muteGroupMentions(roomId, newValue.toBool());
         break;
     }
 }
 
 void RocketChatAccount::parsePublicSettings(const QJsonObject &obj)
 {
     QJsonArray configs = obj.value(QLatin1String("result")).toArray();
 
     for (QJsonValueRef currentConfig : configs) {
         QJsonObject currentConfObject = currentConfig.toObject();
         const QString id = currentConfObject[QStringLiteral("_id")].toString();
         const QVariant value = currentConfObject[QStringLiteral("value")].toVariant();
 
         if (id == QLatin1String("uniqueID")) {
             mRuqolaServerConfig->setUniqueId(value.toString());
         } else if (id == QLatin1String("Jitsi_Domain")) {
             mRuqolaServerConfig->setJitsiMeetUrl(value.toString());
         } else if (id == QLatin1String("Jitsi_URL_Room_Prefix")) {
             mRuqolaServerConfig->setJitsiMeetPrefix(value.toString());
         } else if (id == QLatin1String("FileUpload_Storage_Type")) {
             mRuqolaServerConfig->setFileUploadStorageType(value.toString());
         } else if (id == QLatin1String("Message_AllowEditing")) {
             mRuqolaServerConfig->setAllowMessageEditing(value.toBool());
         } else if (id == QLatin1String("Message_AllowEditing_BlockEditInMinutes")) {
             mRuqolaServerConfig->setBlockEditingMessageInMinutes(value.toInt());
         } else if (id == QLatin1String("OTR_Enable")) {
             mRuqolaServerConfig->setOtrEnabled(value.toBool());
         } else if (id.contains(QRegularExpression(QStringLiteral("^Accounts_OAuth_\\w+")))) {
             if (value.toBool()) {
                 mRuqolaServerConfig->addOauthService(id);
             }
         } else if (id == QLatin1String("Site_Url")) {
             mRuqolaServerConfig->setSiteUrl(value.toString());
         } else if (id == QLatin1String("Site_Name")) {
             mRuqolaServerConfig->setSiteName(value.toString());
         } else if (id == QLatin1String("E2E_Enable")) {
             mRuqolaServerConfig->setEncryptionEnabled(value.toBool());
         } else {
             qCDebug(RUQOLA_LOG) << "Other public settings id " << id << value;
         }
     }
     fillOauthModel();
 }
 
 void RocketChatAccount::fillOauthModel()
 {
     QVector<AuthenticationInfo> fillModel;
     for (int i = 0, total = mLstInfos.count(); i < total; ++i) {
         if (mRuqolaServerConfig->canShowOauthService(mLstInfos.at(i).oauthType())) {
             fillModel.append(mLstInfos.at(i));
         }
     }
     mLoginMethodModel->setAuthenticationInfos(fillModel);
 }
 
 void RocketChatAccount::changeDefaultAuthentication(int index)
 {
     setDefaultAuthentication(mLoginMethodModel->loginType(index));
 }
 
 void RocketChatAccount::setDefaultAuthentication(AuthenticationManager::OauthType type)
 {
     PluginAuthenticationInterface *interface = mLstPluginAuthenticationInterface.value(type);
     if (interface) {
         mDefaultAuthenticationInterface = interface;
     } else {
         qCWarning(RUQOLA_LOG) << "No interface defined for  " << type;
     }
 }
 
 SearchMessageFilterProxyModel *RocketChatAccount::searchMessageFilterProxyModel() const
 {
     return mSearchMessageFilterProxyModel;
 }
 
 SearchMessageModel *RocketChatAccount::searchMessageModel() const
 {
     return mSearchMessageModel;
 }
 
 void RocketChatAccount::initializeAuthenticationPlugins()
 {
     //TODO change it when we change server
     //Clean up at the end.
     const QVector<PluginAuthentication *> lstPlugins = AuthenticationManager::self()->pluginsList();
     qCDebug(RUQOLA_LOG) <<" void RocketChatAccount::initializeAuthenticationPlugins()" << lstPlugins.count();
     mLstPluginAuthenticationInterface.clear();
 
     mLstInfos.clear();
     for (PluginAuthentication *abstractPlugin : lstPlugins) {
         AuthenticationInfo info;
         info.setIconName(abstractPlugin->iconName());
         info.setName(abstractPlugin->name());
         info.setOauthType(abstractPlugin->type());
         if (info.isValid()) {
             mLstInfos.append(info);
         }
 
         PluginAuthenticationInterface *interface = abstractPlugin->createInterface(this);
         interface->setAccount(this);
         mRuqolaServerConfig->addRuqolaAuthenticationSupport(abstractPlugin->type());
         mLstPluginAuthenticationInterface.insert(abstractPlugin->type(), interface);
         //For the moment initialize default interface
         if (abstractPlugin->type() == AuthenticationManager::OauthType::Password) {
             mDefaultAuthenticationInterface = interface;
         }
         qCDebug(RUQOLA_LOG) << " plugin type " << abstractPlugin->type();
     }
     //TODO fill ??? or store QVector<AuthenticationInfo>
 }
 
 PluginAuthenticationInterface *RocketChatAccount::defaultAuthenticationInterface() const
 {
     return mDefaultAuthenticationInterface;
 }
 
 InputCompleterModel *RocketChatAccount::inputCompleterModel() const
 {
     return mInputTextManager->inputCompleterModel();
 }
 
 LoginMethodModel *RocketChatAccount::loginMethodModel() const
 {
     return mLoginMethodModel;
 }
 
 QString RocketChatAccount::authToken() const
 {
     return settings()->authToken();
 }
 
 QString RocketChatAccount::userName() const
 {
     return settings()->userName();
 }
 
 void RocketChatAccount::setAccountName(const QString &accountname)
 {
     //Initialize new account room
     ManagerDataPaths::self()->initializeAccountPath(accountname);
     //qDebug() << "void RocketChatAccount::setAccountName(const QString &servername)"<<accountname;
     loadSettings(ManagerDataPaths::self()->accountConfigFileName(accountname));
     settings()->setAccountName(accountname);
 }
 
 QString RocketChatAccount::accountName() const
 {
     return settings()->accountName();
 }
 
 QString RocketChatAccount::userID() const
 {
     return settings()->userId();
 }
 
 QString RocketChatAccount::password() const
 {
     return settings()->password();
 }
 
 void RocketChatAccount::setAuthToken(const QString &token)
 {
     settings()->setAuthToken(token);
 }
 
 void RocketChatAccount::setPassword(const QString &password)
 {
     settings()->setPassword(password);
 }
 
 void RocketChatAccount::setUserName(const QString &username)
 {
     settings()->setUserName(username);
 }
 
 void RocketChatAccount::setUserID(const QString &userID)
 {
     settings()->setUserId(userID);
 }
 
 QString RocketChatAccount::serverUrl() const
 {
     return settings()->serverUrl();
 }
 
 void RocketChatAccount::setServerUrl(const QString &serverURL)
 {
     settings()->setServerUrl(serverURL);
     restApi()->setServerUrl(serverURL);
     mEmojiManager->setServerUrl(serverURL);
 }
 
 QString RocketChatAccount::recordingVideoPath() const
 {
     return mCache->recordingVideoPath(accountName());
 }
 
 QString RocketChatAccount::recordingImagePath() const
 {
     return mCache->recordingImagePath(accountName());
 }
 
 void RocketChatAccount::downloadFile(const QString &downloadFileUrl, const QUrl &localFile)
 {
     mCache->downloadFile(downloadFileUrl, localFile, false);
 }
 
 QUrl RocketChatAccount::attachmentUrl(const QString &url)
 {
     return mCache->attachmentUrl(url);
 }
 
 void RocketChatAccount::loadHistory(const QString &roomID, const QString &channelType, bool initial)
 {
     //TODO port to restapi
     Q_UNUSED(channelType);
     MessageModel *roomModel = messageModelForRoom(roomID);
     if (roomModel) {
         //TODO add autotest for it !
         QJsonArray params;
         params.append(QJsonValue(roomID));
         // Load history
         const qint64 endDateTime = roomModel->lastTimestamp();
         if (initial || roomModel->isEmpty()) {
             params.append(QJsonValue(QJsonValue::Null));
             params.append(QJsonValue(50)); // Max number of messages to load;
             QJsonObject dateObject;
             //qDebug() << "roomModel->lastTimestamp()" << roomModel->lastTimestamp() << " ROOMID " << roomID;
             dateObject[QStringLiteral("$date")] = QJsonValue(endDateTime);
             params.append(dateObject);
         } else {
             const qint64 startDateTime = roomModel->generateNewStartTimeStamp(endDateTime);
             QJsonObject dateObjectEnd;
             dateObjectEnd[QStringLiteral("$date")] = QJsonValue(endDateTime);
 
             //qDebug() << " QDATE TIME END" << QDateTime::fromMSecsSinceEpoch(endDateTime) << " START "  << QDateTime::fromMSecsSinceEpoch(startDateTime) << " ROOMID" << roomID;
             params.append(dateObjectEnd);
 
             params.append(QJsonValue(50)); // Max number of messages to load;
 
             QJsonObject dateObjectStart;
             //qDebug() << "roomModel->lastTimestamp()" << roomModel->lastTimestamp() << " ROOMID " << roomID;
             dateObjectStart[QStringLiteral("$date")] = QJsonValue(startDateTime);
             params.append(dateObjectStart);
         }
         ddp()->loadHistory(params);
     } else {
         qCWarning(RUQOLA_LOG) << "Room is not found " << roomID;
     }
 }
 
 void RocketChatAccount::setServerVersion(const QString &version)
 {
     qCDebug(RUQOLA_LOG) << " void RocketChatAccount::setServerVersion(const QString &version)" << version;
     mRuqolaServerConfig->setServerVersion(version);
 }
 
 bool RocketChatAccount::needAdaptNewSubscriptionRC60() const
 {
     return mRuqolaServerConfig->needAdaptNewSubscriptionRC60();
 }
 
 bool RocketChatAccount::otrEnabled() const
 {
     return mRuqolaServerConfig->otrEnabled();
 }
 
 bool RocketChatAccount::encryptedEnabled() const
 {
     return mRuqolaServerConfig->encryptionEnabled();
 }
 
 QString RocketChatAccount::serverVersionStr() const
 {
     return mRuqolaServerConfig->serverVersionStr();
 }
 
 ServerConfigInfo *RocketChatAccount::serverConfigInfo() const
 {
     return mServerConfigInfo;
 }
 
 void RocketChatAccount::groupInfo(const QString &roomId)
 {
     restApi()->groupInfo(roomId);
 }
 
+void RocketChatAccount::switchEditingMode(bool b)
+{
+    if (mEditingMode != b) {
+        mEditingMode = b;
+        Q_EMIT editingModeChanged();
+    }
+}
+
 void RocketChatAccount::channelInfo(const QString &roomId)
 {
     restApi()->channelInfo(roomId);
 }
 
 bool RocketChatAccount::allowEditingMessages() const
 {
     return mRuqolaServerConfig->allowMessageEditing();
 }
 
 void RocketChatAccount::parseOtr(const QJsonArray &contents)
 {
     const Otr t = mOtrManager->parseOtr(contents);
     qDebug() << " void RocketChatAccount::parseOtr(const QJsonArray &contents)"<<t;
     //TODO add notification ?
 }
 
 void RocketChatAccount::sendNotification(const QJsonArray &contents)
 {
     QString message;
     QString title;
     QString sender;
     Utils::parseNotification(contents, message, title, sender);
 
     const QString iconFileName = mCache->avatarUrlFromCacheOnly(sender);
     //qDebug() << " iconFileName"<<iconFileName << " sender " << sender;
     QPixmap pix;
     if (!iconFileName.isEmpty()) {
         const QUrl url = QUrl::fromLocalFile(iconFileName);
         //qDebug() << "url.toLocalFile()"<<url.toLocalFile();
         const bool loaded = pix.load(url.toLocalFile().remove(QStringLiteral("file://")), "JPEG");
         //qDebug() << " load pixmap : "<< loaded;
         //qDebug() << " pix " << pix.isNull();
         Q_UNUSED(loaded);
     }
     Q_EMIT notification(title, message, pix);
 }
 
 void RocketChatAccount::inputChannelAutocomplete(const QString &pattern, const QString &exceptions)
 {
     ddp()->inputChannelAutocomplete(pattern, exceptions);
 }
 
 void RocketChatAccount::inputUserAutocomplete(const QString &pattern, const QString &exceptions)
 {
     ddp()->inputUserAutocomplete(pattern, exceptions);
 }
 
 void RocketChatAccount::inputTextCompleter(const QJsonObject &obj)
 {
     mInputTextManager->inputTextCompleter(obj);
 }
 
 void RocketChatAccount::displaySearchedMessage(const QJsonObject &obj)
 {
     mSearchMessageModel->parseResult(obj);
 }
 
 void RocketChatAccount::updateUser(const QJsonObject &object)
 {
     mUserModel->updateUser(object);
 }
 
 void RocketChatAccount::userStatusChanged(const User &user)
 {
     //qDebug() << " void RocketChatAccount::userStatusChanged(const User &user)"<<user.userId() << " userId" << userID();
     if (user.userId() == userID()) {
         //qDebug() << " void RocketChatAccount::userStatusChanged(const User &user) current user !!!!!!!!!!!!" << user;
         statusModel()->setCurrentPresenceStatus(Utils::presenceStatusFromString(user.status()));
     }
     mRoomModel->userStatusChanged(user);
 }
 
 void RocketChatAccount::ignoreUser(const QString &rid, const QString &userId, bool ignore)
 {
     ddp()->ignoreUser(rid, userId, ignore);
 }
 
 void RocketChatAccount::blockUser(const QString &rid, bool block)
 {
     //TODO use restapi
     if (rid.isEmpty()) {
         qCWarning(RUQOLA_LOG) << " void RocketChatAccount::blockUser EMPTY rid ! block " << block;
     } else {
         //qDebug() << " void RocketChatAccount::blockUser userId " << userId << " block " << block << " rid " << rid << " own userdId" << userID();
 
         const QString userId = Utils::userIdFromDirectChannel(rid, userID());
         if (block) {
             ddp()->blockUser(rid, userId);
         } else {
             ddp()->unBlockUser(rid, userId);
         }
     }
 }
 
 void RocketChatAccount::initializeRoom(const QString &roomId, bool loadInitialHistory)
 {
     ddp()->subscribeRoomMessage(roomId);
     getUsersOfRoom(roomId);
 
     if (loadInitialHistory) {
         //Load history
         //TODO fix me use channeltype!
         loadHistory(roomId, QString(), true /*initial loading*/);
     }
 }
 
 void RocketChatAccount::openDocumentation()
 {
     QDesktopServices::openUrl(QUrl(QStringLiteral("help:/")));
 }
diff --git a/src/ruqolacore/rocketchataccount.h b/src/ruqolacore/rocketchataccount.h
index a100d007..f8a42016 100644
--- a/src/ruqolacore/rocketchataccount.h
+++ b/src/ruqolacore/rocketchataccount.h
@@ -1,326 +1,332 @@
 /*
    Copyright (c) 2017-2019 Montel Laurent <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.
 */
 
 #ifndef ROCKETCHATACCOUNT_H
 #define ROCKETCHATACCOUNT_H
 
 #include <QObject>
 #include <QUrl>
 #include <ddpapi/ddpclient.h>
 #include "rocketchataccountsettings.h"
 #include "libruqola_private_export.h"
 #include "authenticationinfo.h"
 #include "file.h"
 class TypingNotification;
 class UsersModel;
 class RoomModel;
 class RoomWrapper;
 class MessageModel;
 class DDPClient;
 class MessageQueue;
 class RocketChatBackend;
 class RoomFilterProxyModel;
 class RuqolaLogger;
 class RuqolaServerConfig;
 class UserCompleterModel;
 class UserCompleterFilterProxyModel;
 class StatusModel;
 class RocketChatCache;
 class EmojiManager;
 class OtrManager;
 class UsersForRoomFilterProxyModel;
 class UsersForRoomModel;
 class FilesForRoomFilterProxyModel;
 class SearchChannelModel;
 class SearchChannelFilterProxyModel;
 class LoginMethodModel;
 class InputCompleterModel;
 class InputTextManager;
 class PluginAuthenticationInterface;
 class Room;
 class SearchMessageModel;
 class SearchMessageFilterProxyModel;
 class ServerConfigInfo;
 class ReceiveTypingNotificationManager;
 namespace RocketChatRestApi {
 class RestApiRequest;
 }
 
 class LIBRUQOLACORE_EXPORT RocketChatAccount : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString userName READ userName WRITE setUserName NOTIFY userNameChanged)
     Q_PROPERTY(QString userID READ userID WRITE setUserID NOTIFY userIDChanged)
     Q_PROPERTY(QString serverUrl READ serverUrl WRITE setServerUrl NOTIFY serverUrlChanged)
     Q_PROPERTY(QString accountName READ accountName WRITE setAccountName NOTIFY accountNameChanged)
     Q_PROPERTY(QString password READ password WRITE setPassword NOTIFY passwordChanged)
     Q_PROPERTY(DDPClient::LoginStatus loginStatus READ loginStatus NOTIFY loginStatusChanged)
+    Q_PROPERTY(bool editingMode READ editingMode NOTIFY editingModeChanged)
 public:
     explicit RocketChatAccount(const QString &accountName = QString(), QObject *parent = nullptr);
     ~RocketChatAccount();
 
     enum RoomInfoType {
         Announcement,
         Description,
         Name,
         Topic,
         ReadOnly,
         Archive,
         RoomType,
         Encrypted,
     };
     Q_ENUM(RoomInfoType)
 
     enum NotificationOptionsType {
         DisableNotifications,
         HideUnreadStatus,
         AudioNotifications,
         DesktopNotifications,
         EmailNotifications,
         MobilePushNotifications,
         UnreadAlert,
         MuteGroupMentions
     };
     Q_ENUM(NotificationOptionsType)
 
     Q_INVOKABLE UsersModel *usersModel() const;
 
     Q_INVOKABLE RoomModel *roomModel() const;
 
     Q_INVOKABLE RoomFilterProxyModel *roomFilterProxyModel() const;
     Q_INVOKABLE UsersForRoomFilterProxyModel *usersForRoomFilterProxyModel(const QString &roomId) const;
     Q_INVOKABLE UsersForRoomModel *usersModelForRoom(const QString &roomId) const;
     Q_INVOKABLE RoomWrapper *getRoomWrapper(const QString &roomId);
     Q_INVOKABLE MessageModel *messageModelForRoom(const QString &roomID);
     Q_INVOKABLE QString getUserCurrentMessage(const QString &roomId);
     Q_INVOKABLE void setUserCurrentMessage(const QString &message, const QString &roomId);
 
     Q_INVOKABLE void textEditing(const QString &roomId, const QString &str);
 
     Q_INVOKABLE void leaveRoom(const QString &roomId, const QString &channelType);
     Q_INVOKABLE void hideRoom(const QString &roomId, const QString &channelType = QString());
     Q_INVOKABLE void tryLogin();
     Q_INVOKABLE void logOut();
     Q_INVOKABLE void clearUnreadMessages(const QString &roomId);
 
     Q_INVOKABLE void changeFavorite(const QString &roomId, bool checked);
     Q_INVOKABLE void sendMessage(const QString &roomID, const QString &message);
     Q_INVOKABLE void updateMessage(const QString &roomID, const QString &messageId, const QString &message);
     Q_INVOKABLE void openChannel(const QString &url);
     Q_INVOKABLE void joinJitsiConfCall(const QString &roomId);
     Q_INVOKABLE void createNewChannel(const QString &name, bool readOnly, bool privateRoom, const QString &userNames, bool encryptedRoom, const QString &password);
     Q_INVOKABLE void joinRoom(const QString &roomId, const QString &joinCode = QString());
     Q_INVOKABLE void openDirectChannel(const QString &username);
     Q_INVOKABLE void listEmojiCustom();
     Q_INVOKABLE void setDefaultStatus(User::PresenceStatus status);
     Q_INVOKABLE void changeDefaultStatus(int index);
     Q_INVOKABLE void createJitsiConfCall(const QString &roomId);
     Q_INVOKABLE void deleteMessage(const QString &messageId, const QString &roomId);
     Q_INVOKABLE void userAutocomplete(const QString &searchText, const QString &exception);
     Q_INVOKABLE void eraseRoom(const QString &roomId, const QString &channelType = QString());
     Q_INVOKABLE void changeChannelSettings(const QString &roomId, RocketChatAccount::RoomInfoType infoType, const QVariant &newValue, const QString &channelType = QString());
     Q_INVOKABLE void changeNotificationsSettings(const QString &roomId, RocketChatAccount::NotificationOptionsType notificationsType, const QVariant &newValue);
     Q_INVOKABLE QString recordingVideoPath() const;
     Q_INVOKABLE QString recordingImagePath() const;
     Q_INVOKABLE void downloadFile(const QString &downloadFileUrl, const QUrl &localFile);
     Q_INVOKABLE void starMessage(const QString &messageId, const QString &rid, bool starred);
     Q_INVOKABLE void uploadFile(const QString &roomId, const QString &description, const QString &messageText, const QUrl &fileUrl);
     Q_INVOKABLE QString serverUrl() const;
 
     Q_INVOKABLE QString avatarUrl(const QString &userId);
 
     Q_INVOKABLE StatusModel *statusModel() const;
 
     Q_INVOKABLE Q_REQUIRED_RESULT QUrl attachmentUrl(const QString &url);
     Q_INVOKABLE void loadHistory(const QString &roomID, const QString &channelType = QString(), bool initial = false);
     Q_INVOKABLE Q_REQUIRED_RESULT bool allowEditingMessages() const;
     Q_INVOKABLE Q_REQUIRED_RESULT bool otrEnabled() const;
     Q_INVOKABLE void channelAndPrivateAutocomplete(const QString &pattern);
     Q_INVOKABLE UserCompleterFilterProxyModel *userCompleterFilterModelProxy() const;
     Q_INVOKABLE void roomFiles(const QString &roomId, const QString &channelType = QString());
     Q_INVOKABLE FilesForRoomFilterProxyModel *filesForRoomFilterProxyModel(const QString &roomId) const;
     Q_INVOKABLE void addUserToRoom(const QString &username, const QString &roomId, const QString &channelType);
     Q_INVOKABLE SearchChannelFilterProxyModel *searchChannelFilterProxyModel() const;
     Q_INVOKABLE InputCompleterModel *inputCompleterModel() const;
     Q_INVOKABLE LoginMethodModel *loginMethodModel() const;
     Q_INVOKABLE Room *getRoom(const QString &roomId);
 
     Q_INVOKABLE void changeDefaultAuthentication(int index);
     Q_INVOKABLE void messageSearch(const QString &pattern, const QString &rid);
 
     Q_INVOKABLE SearchMessageFilterProxyModel *searchMessageFilterProxyModel() const;
     Q_INVOKABLE void setInputTextChanged(const QString &str, int position);
     Q_INVOKABLE QString replaceWord(const QString &newWord, const QString &str, int position);
     Q_INVOKABLE void blockUser(const QString &userId, bool block);
     Q_INVOKABLE QString avatarUrlFromDirectChannel(const QString &rid);
     Q_INVOKABLE void deleteFileMessage(const QString &roomId, const QString &fileId, const QString &channelType);
     Q_INVOKABLE void openDocumentation();
     Q_INVOKABLE void clearSearchModel();
 
     Q_INVOKABLE void reactOnMessage(const QString &messageId, const QString &emoji, bool shouldReact);
     Q_INVOKABLE void ignoreUser(const QString &rid, const QString &userId, bool ignore);
     Q_INVOKABLE ReceiveTypingNotificationManager *receiveTypingNotificationManager() const;
     Q_INVOKABLE Q_REQUIRED_RESULT bool encryptedEnabled() const;
     Q_INVOKABLE Q_REQUIRED_RESULT QString serverVersionStr() const;
     Q_INVOKABLE Q_REQUIRED_RESULT ServerConfigInfo *serverConfigInfo() const;
 
     Q_INVOKABLE void channelInfo(const QString &roomId);
     Q_INVOKABLE void groupInfo(const QString &roomId);
 
+    Q_INVOKABLE void switchEditingMode(bool b);
 
     SearchChannelModel *searchChannelModel() const;
     UserCompleterModel *userCompleterModel() const;
     RocketChatAccountSettings *settings() const;
     DDPClient *ddp();
 
-    DDPClient::LoginStatus loginStatus();
+    bool editingMode() const;
+
+    DDPClient::LoginStatus loginStatus();    
     RocketChatRestApi::RestApiRequest *restApi();
 
     //Make it private in future
     void slotInformTypingStatus(const QString &room, bool typing);
 
     MessageQueue *messageQueue() const;
 
     RocketChatBackend *rocketChatBackend() const;
 
     RuqolaLogger *ruqolaLogger() const;
 
     void loadEmoji(const QJsonObject &obj);
     void parsePublicSettings(const QJsonObject &obj);
 
     RuqolaServerConfig *ruqolaServerConfig() const;
 
     void setUserName(const QString &username);
     Q_REQUIRED_RESULT QString userName() const;
 
     void setAccountName(const QString &servername);
     Q_REQUIRED_RESULT QString accountName() const;
 
     void setUserID(const QString &userID);
     Q_REQUIRED_RESULT QString userID() const;
 
     void setPassword(const QString &password);
     Q_REQUIRED_RESULT QString password() const;
 
     void setAuthToken(const QString &token);
     Q_REQUIRED_RESULT QString authToken() const;
 
     void setServerUrl(const QString &serverUrl);
 
     void sendNotification(const QJsonArray &contents);
     void parseOtr(const QJsonArray &contents);
     void setServerVersion(const QString &version);
 
     Q_REQUIRED_RESULT bool needAdaptNewSubscriptionRC60() const;
     EmojiManager *emojiManager() const;
     Q_REQUIRED_RESULT QString userStatusIconFileName(const QString &id);
 
     void getUsersOfRoom(const QString &roomId);
     void parseUsersForRooms(const QString &roomId, const QJsonObject &root);
 
     void loadAutoCompleteChannel(const QJsonObject &obj);
 
     void insertCompleterUsers();
     void insertFilesList(const QString &roomId);
 
     void inputChannelAutocomplete(const QString &pattern, const QString &exceptions);
     void inputUserAutocomplete(const QString &pattern, const QString &exceptions);
     void inputTextCompleter(const QJsonObject &obj);
     PluginAuthenticationInterface *defaultAuthenticationInterface() const;
 
     SearchMessageModel *searchMessageModel() const;
 
     void displaySearchedMessage(const QJsonObject &obj);
 
     void updateUser(const QJsonObject &object);
 
     void initializeRoom(const QString &roomId, bool loadInitialHistory = true);
 
     void removeSettings();
 
 Q_SIGNALS:
     void connectedChanged();
     void accountNameChanged();
     void userNameChanged();
     void userIDChanged();
     void passwordChanged();
     void serverUrlChanged();
     void loginStatusChanged();
     void logoutDone(const QString &accountname);
     void added(const QJsonObject &item);
     void changed(const QJsonObject &item);
     void removed(const QJsonObject &item);
     void notification(const QString &title, const QString &message, const QPixmap &pixmap);
     void fileDownloaded(const QString &filePath, const QUrl &cacheImageUrl);
     void updateNotification(bool hasAlert, int nbUnread, const QString &accountName);
     void missingChannelPassword(const QString &roomId);
+    void editingModeChanged();
 
 private:
     Q_DISABLE_COPY(RocketChatAccount)
     void slotChannelFilesDone(const QJsonObject &obj, const QString &roomId);
     void loadEmojiRestApi(const QJsonObject &obj);
     void slotSearchMessages(const QJsonObject &obj);
     void slotNeedToUpdateNotification();
     void insertAvatarUrl(const QString &userId, const QString &url);
     void loadSettings(const QString &accountFileName);
     void clearModels();
     void fillOauthModel();
     void initializeAuthenticationPlugins();
     void setDefaultAuthentication(AuthenticationManager::OauthType type);
     void userStatusChanged(const User &user);
     void setChannelJoinDone(const QString &roomId);
     void openArchivedRoom(const QString &roomId);
 
     QVector<File> parseFilesInChannel(const QJsonObject &obj);
 
     PluginAuthenticationInterface *mDefaultAuthenticationInterface = nullptr;
 
     QHash<AuthenticationManager::OauthType, PluginAuthenticationInterface *> mLstPluginAuthenticationInterface;
     QVector<AuthenticationInfo> mLstInfos;
     RocketChatAccountSettings *mSettings = nullptr;
 
     EmojiManager *mEmojiManager = nullptr;
     TypingNotification *mTypingNotification = nullptr;
     UsersModel *mUserModel = nullptr;
     RoomModel *mRoomModel = nullptr;
     RoomFilterProxyModel *mRoomFilterProxyModel = nullptr;
     DDPClient *mDdp = nullptr;
     RocketChatRestApi::RestApiRequest *mRestApi = nullptr;
     MessageQueue *mMessageQueue = nullptr;
     RocketChatBackend *mRocketChatBackend = nullptr;
     RuqolaLogger *mRuqolaLogger = nullptr;
     RuqolaServerConfig *mRuqolaServerConfig = nullptr;
     UserCompleterModel *mUserCompleterModel = nullptr;
     UserCompleterFilterProxyModel *mUserCompleterFilterModelProxy = nullptr;
     StatusModel *mStatusModel = nullptr;
     RocketChatCache *mCache = nullptr;
     OtrManager *mOtrManager = nullptr;
     SearchChannelModel *mSearchChannelModel = nullptr;
     SearchChannelFilterProxyModel *mSearchChannelFilterProxyModel = nullptr;
     LoginMethodModel *mLoginMethodModel = nullptr;
     InputTextManager *mInputTextManager = nullptr;
 
     SearchMessageModel *mSearchMessageModel = nullptr;
     SearchMessageFilterProxyModel *mSearchMessageFilterProxyModel = nullptr;
     ReceiveTypingNotificationManager *mReceiveTypingNotificationManager = nullptr;
     ServerConfigInfo *mServerConfigInfo = nullptr;
+    bool mEditingMode = false;
 };
 
 #endif // ROCKETCHATACCOUNT_H