diff --git a/src/apps/qml/qml/common/AvatarImage.qml b/src/apps/qml/qml/common/AvatarImage.qml
--- a/src/apps/qml/qml/common/AvatarImage.qml
+++ b/src/apps/qml/qml/common/AvatarImage.qml
@@ -39,16 +39,12 @@
     readonly property int defaultWidth: compactViewMode ? Kirigami.Units.fontMetrics.height :Kirigami.Units.iconSizes.medium
     signal showUserInfo()
 
-    Layout.alignment: Qt.AlignTop | Qt.AlignCenter
-    Layout.fillHeight: false
     //Customize it.
     implicitWidth: defaultWidth
     implicitHeight: implicitWidth
 
     radius: 3
 
-    anchors.rightMargin: 2*Kirigami.Units.smallSpacing
-
     color: avatarurl !== "" ? "transparent" : MessageScript.stringToColour(username)
     Image {
         id: avatarImage
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
@@ -42,6 +42,8 @@
 
         AvatarImage {
             id: avatarRect
+
+            Layout.alignment: Qt.AlignTop
             avatarurl: i_avatar
             aliasname: i_aliasname
             username: i_username
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
@@ -68,6 +68,8 @@
 
         AvatarImage {
             id: avatarRect
+
+            Layout.alignment: Qt.AlignTop
             avatarurl: i_avatar
             aliasname: i_aliasname
             username: i_username