diff --git a/src/apps/qml/qml/messages/ReactionsPopup.qml b/src/apps/qml/qml/messages/ReactionsPopup.qml
index 6a927b78..c942a76c 100644
--- a/src/apps/qml/qml/messages/ReactionsPopup.qml
+++ b/src/apps/qml/qml/messages/ReactionsPopup.qml
@@ -1,68 +1,77 @@
 /*
  * Copyright (C) 2019-2020 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.Layouts 1.12
 
 
 import org.kde.kirigami 2.7 as Kirigami
 import "../common"
 
 Kirigami.Icon {
     id: reactIcon
 
+    property bool showIcon: true
+
     signal insertReaction(string emoji)
     source: "face-smile"
     width: height
     height: 18
-    opacity: mouseArea.containsMouse ? 1.0 : 0.3
+    opacity: {
+        if (!showIcon) {
+            return 0.0;
+        }
+        else {
+            return mouseArea.containsMouse ? 1.0 : 0.3;
+        }
+    }
 
     MouseArea {
         id: mouseArea
         anchors.fill: parent
         hoverEnabled: true
         cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
         onClicked: {
             if (emoticonMenuLoader.active)
                 emoticonMenuLoader.active = false
             else
                 emoticonMenuLoader.active = true
         }
     }
     Loader {
         id: emoticonMenuLoader
         active: false
         sourceComponent :EmoticonMenu {
             id: emoticonMenu
             emojiPopupModel: appid.emojiModel
             width: Kirigami.Units.gridUnit * 20
             height: Kirigami.Units.gridUnit * 15
             x: -width + parent.width
             y: -height - 10
             Component.onCompleted: {
                 open()
             }
             onInsertEmoticon: {
                 reactIcon.insertReaction(emoti)
             }
         }
     }
 }
diff --git a/src/apps/qml/qml/messages/UserMessage.qml b/src/apps/qml/qml/messages/UserMessage.qml
index 29d0207a..044d9ef0 100644
--- a/src/apps/qml/qml/messages/UserMessage.qml
+++ b/src/apps/qml/qml/messages/UserMessage.qml
@@ -1,279 +1,281 @@
 /*
 
  * Copyright 2016  Riccardo Iaconelli <riccardo@kde.org>
  * Copyright (c) 2017-2020 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 org.kde.kirigami 2.7 as Kirigami
 import QtQuick.Controls 2.5 as QQC2
 import QtQuick.Layouts 1.12
 import Ruqola 1.0
 
 import "../common"
 
 MessageBase {
     id: root
 
     property alias attachments: attachmentsLayout.children
 
     implicitHeight: rowLayout.height
 
     Loader {
         id: messageMenuLoader
         active: false
         property var posX
         property var posY
         sourceComponent: MessageMenu {
             id: menu
             x: messageMenuLoader.posX
             y: messageMenuLoader.posY
             can_edit_message: i_can_edit_message
             user_ignored : i_user_ignored
             starred: i_starred
             pinned_message: i_pinned
             showTranslatedMessage: i_showTranslatedMessage
             Component.onCompleted: {
                 open()
             }
             onAboutToHide: {
                 messageMenuLoader.active = false;
             }
         }
     }
 
     RowLayout {
         id: rowLayout
 
         width: parent.width
 
         AvatarImage {
             id: avatarRect
             avatarurl: i_avatar
             aliasname: i_aliasname
             username: i_username
             onShowUserInfo: {
                 messageMain.showUserInfo(i_own_username)
             }
             visible: !i_groupable
         }
         ColumnLayout {
             spacing: Kirigami.Units.smallSpacing / 2 // reduce spacing a little
             GridLayout {
                 rowSpacing: 0
                 columnSpacing: Kirigami.Units.smallSpacing
                 columns: compactViewMode ? -1 : 1 // user name label + roles info in one row
                 RowLayout {
                     Layout.alignment: Qt.AlignLeft | Qt.AlignTop
                     Layout.rightMargin: Kirigami.Units.smallSpacing
 
                     QQC2.Label {
                         id: usernameLabel
                         font.bold: true
                         text: i_aliasname !== "" ? i_aliasname +  ' @' + i_username : '@' + i_username
 
                         MouseArea {
                             anchors.fill: parent
                             enabled: i_username !== appid.rocketChatAccount.userName
                             hoverEnabled: true
                             cursorShape: containsMouse ? Qt.PointingHandCursor : Qt.ArrowCursor
                             acceptedButtons: Qt.LeftButton | Qt.RightButton
                             onClicked: {
                                 if (mouse.button === Qt.RightButton) {
                                     if (i_useMenuMessage) {
                                         messageMenuLoader.posX = mouse.x
                                         messageMenuLoader.posY = mouse.y
                                         if (messageMenuLoader.active)
                                             messageMenuLoader.active = false
                                         else
                                             messageMenuLoader.active = true
                                     }
                                 } else {
                                     messageMain.linkActivated("ruqola:/user/" + i_username)
                                 }
                             }
                         }
                         visible: !i_groupable
                     }
 
                     Kirigami.Icon {
                         id: rolesInfo
                         source: "documentinfo"
                         width: height
                         height: 18
                         visible: i_roles.length > 0
                         opacity: rolesInfoMA.containsMouse ? 1.0 : 0.6
                         MouseArea {
                             id: rolesInfoMA
                             hoverEnabled: true
                             anchors.fill: parent
                         }
                         QQC2.ToolTip.visible: rolesInfoMA.containsMouse
                         QQC2.ToolTip.text: i_roles
                     }
 
                     Kirigami.Icon {
                         id: editedInfo
                         source: "document-edit"
                         width: height
                         height: 18
                         visible: i_editedByUserName !== ""
                         opacity: editedInfoMA.containsMouse ? 1.0 : 0.6
                         MouseArea {
                             id: editedInfoMA
                             hoverEnabled: true
                             anchors.fill: parent
                         }
                         QQC2.ToolTip.visible: editedInfoMA.containsMouse
                         QQC2.ToolTip.text: visible ? i18n("Edited by %1", i_editedByUserName) : ""
                     }
                 }
 
                 QQC2.Label {
                     id: threadPreview
 
                     // TODO: I think the whole thread preview item needs to be visually redesigned...
                     /// no eliding possible with rich text, cf. QTBUG-16567, fake it
                     /// not ideal, see: https://stackoverflow.com/a/29923358
                     function elidedText(s, length) {
                         var elidedText = s.substring(0, length)
                             if (s.length > length)
                                 elidedText += "..."
                         return elidedText
                     }
 
                     Layout.fillWidth: !compactViewMode
                     Layout.alignment: Qt.AlignLeft | Qt.AlignTop
                     visible: i_threadPreview.length > 0
                     textFormat: Text.RichText
                     color: "red" //Convert to kirigami color
                     font.pointSize: textLabel.font.pointSize - 1
                     text: compactViewMode ? elidedText(i_threadPreview, 30) : i_threadPreview
                     wrapMode: compactViewMode ? Text.NoWrap : Text.Wrap
                     MouseArea {
                         anchors.fill: parent
                         acceptedButtons: Qt.RightButton | Qt.LeftButton
 
                         onClicked: {
                             //console.log("open thread "  + i_tmid)
                             messageMain.openThread(i_tmid, i_threadPreview)
                         }
                     }
                 }
                 QQC2.Label {
                     id: textLabel
                     Layout.fillWidth: true
 
                     textFormat: Text.RichText
 
 
                     text: i_messageText
                     wrapMode: QQC2.Label.Wrap
 
                     onLinkActivated: messageMain.linkActivated(link)
                     MouseArea {
                         anchors.fill: parent
                         acceptedButtons: Qt.RightButton
 
                         onClicked: {
                             if (i_useMenuMessage) {
                                 if (mouse.button === Qt.RightButton) {
                                     messageMenuLoader.posX = mouse.x
                                     messageMenuLoader.posY = mouse.y
                                     if (messageMenuLoader.active)
                                         messageMenuLoader.active = false
                                     else
                                         messageMenuLoader.active = true
                                 }
                             }
                         }
                     }
                 }
 
                 ColumnLayout {
                     id: urlColumn
                     Layout.fillWidth: true
                     //TODO
                     //Reactivate when we have a parsed url !
                     //see info about bugs
 
                     //                    Repeater {
                     //                        id: repeaterUrl
 
                     //                        model: i_urls
                     //                        Text {
                     //                            //Display it only if url != text otherwise it's not necessary
                     //                            visible: model.modelData.url !== i_originalMessage
                     //                            width: urlColumn.width
                     //                            text: model.modelData.description === ""  ?
                     //                                      RuqolaUtils.markdownToRichText(model.modelData.url) :
                     //                                      RuqolaUtils.markdownToRichText(model.modelData.description)
                     //                            wrapMode: QQC2.Label.Wrap
                     //                            textFormat: Text.RichText
 
                     //                            onLinkActivated: messageMain.linkActivated(link)
                     //                        }
                     //                    }
 
                     RowLayout {
                         Layout.fillWidth: true
                         RepeaterReactions {
                             id: repearterReactions
                             model: i_reactions
                             onAddReaction: {
                                 messageMain.addReaction(i_messageID, emoji)
                             }
                             onDeleteReaction: {
                                 messageMain.deleteReaction(i_messageID, emoji)
                             }
                         }
                     }
                 }
             }
 
             ColumnLayout {
                 id: attachmentsLayout
                 Layout.fillWidth: true
             }
 
             ThreadLabel {
                 Layout.fillWidth: true
                 onOpenThread: {
                     console.log(RuqolaDebugCategorySingleton.category, " OPen thread " + i_messageID)
                     messageMain.openThread(i_messageID, i_messageText)
                 }
             }
         }
+
         ReactionsPopup {
-            visible: i_useMenuMessage && root.hovered
+            visible: i_useMenuMessage
+            showIcon: root.hovered
             onInsertReaction: {
                 messageMain.addReaction(i_messageID, emoji)
             }
         }
 
         TimestampText {
             id: timestampText
             timestamp: i_timestamp
             visible: !i_groupable
         }
     }
 }