diff --git a/src/apps/qml/qml/messages/JitsiVideoMessage.qml b/src/apps/qml/qml/messages/JitsiVideoMessage.qml
--- a/src/apps/qml/qml/messages/JitsiVideoMessage.qml
+++ b/src/apps/qml/qml/messages/JitsiVideoMessage.qml
@@ -33,7 +33,13 @@
 MessageBase {
     id: root
 
+    implicitHeight: rowLayout.height
+
     RowLayout {
+        id: rowLayout
+
+        width: parent.width
+
         AvatarImage {
             id: avatarRect
             avatarurl: i_avatar
diff --git a/src/apps/qml/qml/messages/MessageBase.qml b/src/apps/qml/qml/messages/MessageBase.qml
--- a/src/apps/qml/qml/messages/MessageBase.qml
+++ b/src/apps/qml/qml/messages/MessageBase.qml
@@ -19,10 +19,11 @@
 */
 
 import QtQuick 2.9
+import QtQuick.Controls 2.5 as QQC2
 
 import QtQuick.Layouts 1.12
 
-ColumnLayout {
+QQC2.Button {
     id: main
 
     property var messageMain: undefined
diff --git a/src/apps/qml/qml/messages/SystemMessage.qml b/src/apps/qml/qml/messages/SystemMessage.qml
--- a/src/apps/qml/qml/messages/SystemMessage.qml
+++ b/src/apps/qml/qml/messages/SystemMessage.qml
@@ -34,8 +34,13 @@
 
     property string i_systemMessageType
 
+    implicitHeight: rowLayout.height
 
     RowLayout {
+        id: rowLayout
+
+        width: parent.width
+
         ColumnLayout {
             //Layout.fillHeight: true
             QQC2.Label {
diff --git a/src/apps/qml/qml/messages/UserMessage.qml b/src/apps/qml/qml/messages/UserMessage.qml
--- a/src/apps/qml/qml/messages/UserMessage.qml
+++ b/src/apps/qml/qml/messages/UserMessage.qml
@@ -36,7 +36,8 @@
 
     property alias attachments: attachmentsLayout.children
 
-    Layout.alignment: Qt.AlignTop
+    implicitHeight: rowLayout.height
+
     Loader {
         id: messageMenuLoader
         active: false
@@ -61,6 +62,10 @@
     }
 
     RowLayout {
+        id: rowLayout
+
+        width: parent.width
+
         AvatarImage {
             id: avatarRect
             avatarurl: i_avatar
@@ -259,7 +264,7 @@
             }
         }
         ReactionsPopup {
-            visible: i_useMenuMessage
+            visible: i_useMenuMessage && root.hovered
             onInsertReaction: {
                 messageMain.addReaction(i_messageID, emoji)
             }
diff --git a/src/widgets/room/roomwidget.cpp b/src/widgets/room/roomwidget.cpp
--- a/src/widgets/room/roomwidget.cpp
+++ b/src/widgets/room/roomwidget.cpp
@@ -36,6 +36,7 @@
 #include <QApplication>
 #include <QStackedWidget>
 #include <QMimeData>
+#include <QPointer>
 
 RoomWidget::RoomWidget(QWidget *parent)
     : QWidget(parent)