diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml
index 3a3266fe..407026c6 100644
--- a/src/app/commoncomponents/SBSMessageBase.qml
+++ b/src/app/commoncomponents/SBSMessageBase.qml
@@ -60,6 +60,8 @@ Control {
     property real textContentHeight
     property bool isReply: ReplyTo !== ""
 
+    property real maxMsgWidth: root.width - senderMargin - 2 * hPadding - avatarBlockWidth
+
     // If the ListView attached properties are not available,
     // then the root delegate is likely a Loader.
     readonly property ListView listView: ListView.view ? ListView.view : parent.ListView.view
@@ -350,7 +352,7 @@ Control {
                     height: contentHeight + 5
                     reactions: Reactions
                     borderColor: root.getBaseColor()
-                    maxWidth: 2/3 * maxMsgWidth - JamiTheme.emojiMargins
+                    maxWidth: 2 / 3 * maxMsgWidth - JamiTheme.emojiMargins
 
                     state: root.isOutgoing ? "anchorsRight" : (emojiReactions.width > bubble.width - JamiTheme.emojiMargins ? "anchorsLeft" : "anchorsRight")
 
@@ -364,12 +366,12 @@ Control {
                         State {
                             name: "anchorsRight"
                             AnchorChanges {
-                                target: emojiReactions;
+                                target: emojiReactions
                                 anchors.right: bubble.right
                                 anchors.left: undefined
                             }
                             PropertyChanges {
-                                target: emojiReactions;
+                                target: emojiReactions
                                 anchors.rightMargin: JamiTheme.emojiMargins
                                 anchors.leftMargin: 0
                             }
@@ -377,12 +379,12 @@ Control {
                         State {
                             name: "anchorsLeft"
                             AnchorChanges {
-                                target: emojiReactions;
+                                target: emojiReactions
                                 anchors.right: undefined
-                                anchors.left:  bubble.left
+                                anchors.left: bubble.left
                             }
                             PropertyChanges {
-                                target: emojiReactions;
+                                target: emojiReactions
                                 anchors.rightMargin: 0
                                 anchors.leftMargin: JamiTheme.emojiMargins
                             }
diff --git a/src/app/commoncomponents/TextMessageDelegate.qml b/src/app/commoncomponents/TextMessageDelegate.qml
index f2a5c12b..b97ea6f0 100644
--- a/src/app/commoncomponents/TextMessageDelegate.qml
+++ b/src/app/commoncomponents/TextMessageDelegate.qml
@@ -30,15 +30,14 @@ SBSMessageBase {
 
     property bool isRemoteImage
     property bool isEmojiOnly: IsEmojiOnly
-    property real maxMsgWidth: root.width - senderMargin - 2 * hPadding - avatarBlockWidth
     property string colorUrl: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewLinkColorLight : JamiTheme.chatviewLinkColorDark
     property string colorText: UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark
 
     Connections {
         target: bubble
         function onColorChanged(color) {
-            root.colorUrl = UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewLinkColorLight : JamiTheme.chatviewLinkColorDark
-            root.colorText = UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark
+            root.colorUrl = UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewLinkColorLight : JamiTheme.chatviewLinkColorDark;
+            root.colorText = UtilsAdapter.luma(bubble.color) ? JamiTheme.chatviewTextColorLight : JamiTheme.chatviewTextColorDark;
             // Update parsed body with correct colors
             if (Body !== "")
                 MessagesAdapter.parseMessage(Id, Body, UtilsAdapter.getAppValue(Settings.DisplayHyperlinkPreviews), root.colorUrl, bubble.color);
@@ -65,7 +64,7 @@ SBSMessageBase {
             text: {
                 if (Body !== "" && ParsedBody.length === 0) {
                     MessagesAdapter.parseMessage(Id, Body, UtilsAdapter.getAppValue(Settings.DisplayHyperlinkPreviews), root.colorUrl, bubble.color);
-                    return ""
+                    return "";
                 }
                 return (ParsedBody !== "") ? ParsedBody : "<i>(" + JamiStrings.deletedMessage + ")</i>";
             }
@@ -277,5 +276,5 @@ SBSMessageBase {
             duration: 100
         }
     }
-    Component.onCompleted: opacity = 1;
+    Component.onCompleted: opacity = 1
 }