diff --git a/src/qml/Chat/Timeline/EventContent.qml b/src/qml/Chat/Timeline/EventContent.qml
index 8211fa06..b46480c0 100644
--- a/src/qml/Chat/Timeline/EventContent.qml
+++ b/src/qml/Chat/Timeline/EventContent.qml
@@ -43,7 +43,8 @@ Row {
                 contentLabel.implicitWidth
             )
         )
-        height: nameLabel.height + contentLabel.implicitHeight
+        height: (nameLabel.visible ? nameLabel.height : 0) +
+                contentLabel.implicitHeight
         y: parent.height / 2 - height / 2
 
         Column {
@@ -52,10 +53,8 @@ Row {
 
             HLabel {
                 id: nameLabel
-                visible: height > 0
                 width: parent.width
-                height: hideNameLine ? 0 : implicitHeight
-                Behavior on height { HNumberAnimation {} }
+                visible: ! hideNameLine
 
                 text: senderInfo.displayName || model.senderId
                 color: Utils.nameColor(avatar.name)